Merge branch 'master' into staging

2016-07-08 20:36:44 +03:00 · 2016-07-08 20:36:44 +03:00 · 8b92103ae8
commit 8b92103ae8
parent 4ae98c2064 7921e68734
202 changed files with 12668 additions and 749 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -264,6 +264,7 @@
  muflax = "Stefan Dorn <mail@muflax.com>";
  myrl = "Myrl Hex <myrl.0xf@gmail.com>";
  nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
+  Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
  nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
  nequissimus = "Tim Steinbach <tim@nequissimus.com>";
  nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@ -12,6 +12,8 @@ rec {
  toShellPath = shell:
    if types.shellPackage.check shell then
      "/run/current-system/sw${shell.shellPath}"
+    else if types.package.check shell then
+      throw "${shell} is not a shell package"
    else
      shell;
 }
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@ -30,8 +30,7 @@ let
        description = ''
          If this option is set, ‘device’ is interpreted as the
          path of a swapfile that will be created automatically
-          with the indicated size (in megabytes) if it doesn't
-          exist.
+          with the indicated size (in megabytes).
        '';
      };

@ -132,9 +131,13 @@ in
            script =
              ''
                ${optionalString (sw.size != null) ''
-                  if [ ! -e "${sw.device}" ]; then
+                  currentSize=$(( $(stat -c "%s" "${sw.device}" 2>/dev/null || echo 0) / 1024 / 1024 ))
+                  if [ "${toString sw.size}" != "$currentSize" ]; then
                    fallocate -l ${toString sw.size}M "${sw.device}" ||
                      dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size}
+                    if [ "${toString sw.size}" -lt "$currentSize" ]; then
+                      truncate --size "${toString sw.size}M" "${sw.device}"
+                    fi
                    chmod 0600 ${sw.device}
                    ${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"}
                  fi
--- a/nixos/modules/programs/spacefm.nix
+++ b/nixos/modules/programs/spacefm.nix
@ -18,7 +18,7 @@ in
        type = types.bool;
        default = false;
        description = ''
-          Whether to install SpaceFM and create <filename>/etc/spacefm/spacefm.conf<filename>.
+          Whether to install SpaceFM and create <filename>/etc/spacefm/spacefm.conf</filename>.
        '';
      };

--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@ -52,6 +52,8 @@ in
  config = mkIf config.services.shairport-sync.enable {

    services.avahi.enable = true;
+    services.avahi.publish.enable = true;
+    services.avahi.publish.userServices = true;

    users.extraUsers = singleton
      { name = cfg.user;
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@ -501,7 +501,7 @@ sub getEfiTarget {
 my @deviceTargets = getDeviceTargets();
 my $efiTarget = getEfiTarget();
 my $prevGrubState = readGrubState();
-my @prevDeviceTargets = split/:/, $prevGrubState->devices;
+my @prevDeviceTargets = split/,/, $prevGrubState->devices;

 my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference());
 my $nameDiffer = get("fullName") ne $prevGrubState->name;
@ -549,7 +549,7 @@ if ($requireNewInstall != 0) {
    print FILE get("fullName"), "\n" or die;
    print FILE get("fullVersion"), "\n" or die;
    print FILE $efiTarget, "\n" or die;
-    print FILE join( ":", @deviceTargets ), "\n" or die;
+    print FILE join( ",", @deviceTargets ), "\n" or die;
    print FILE $efiSysMountPoint, "\n" or die;
    close FILE or die;
 }
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@ -20,7 +20,8 @@ let cfg = config.ec2; in
      autoResize = true;
    };

-    boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
+    boot.extraModulePackages = [ config.boot.kernelPackages.ixgbevf ];
+    boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" "ixgbevf" ];
    boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];

    # Prevent the nouveau kernel module from being loaded, as it
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ b/pkgs/applications/editors/kile/frameworks.nix
@ -21,12 +21,12 @@

 stdenv.mkDerivation rec {
  name = "kile-${version}";
-  version = "2016-02-14";
+  version = "2016-07-02";

  src = fetchgit {
    url = git://anongit.kde.org/kile.git;
-    rev = "7b238c42580abc936816d4ea0df61d0cbbefecc4";
-    sha256 = "f37d531489a84911b47664697bb3bddc0ba5591854749c17fb0c6b1e71dbc6ee";
+    rev = "d38bc7069667119cc891b351188484ca6fb88973";
+    sha256 = "1nha71i16fs7nq2812b5565nbmbsbs3ak5czas6xg1dg5bsvdqh8";

  };

--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@ -1,67 +1,42 @@
-{ stdenv, fetchurl, unzip, cmake, pkgconfig, makeWrapper
-, hunspell, minizip, boost, xercesc
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+, boost, xercesc
 , qtbase, qttools, qtwebkit, qtxmlpatterns
+, python3, python3Packages
 }:

-let
-  version = "0.7.4";
-
-in
-
 stdenv.mkDerivation rec {
  name = "sigil-${version}";
+  version = "0.9.6";

-  src = fetchurl {
-    url = "https://sigil.googlecode.com/files/Sigil-${version}-Code.zip";
-    sha256 = "68c7ca15ea8611921af0c435369563f55c6afd2ef1fb0945cf6c4a47429b0fb5";
+  src = fetchFromGitHub {
+    sha256 = "0hihd5f3avpdvxwp5j80qdg74zbw7p20y6j9q8cw7wd0bak58h9c";
+    rev = version;
+    repo = "Sigil";
+    owner = "Sigil-Ebook";
  };

+  pythonPath = with python3Packages; [ lxml ];
+
+  propagatedBuildInputs = with python3Packages; [ lxml ];
+
  buildInputs = [
-    unzip cmake pkgconfig
-    hunspell minizip boost xercesc qtbase qttools qtwebkit qtxmlpatterns
+    cmake pkgconfig
+    boost xercesc qtbase qttools qtwebkit qtxmlpatterns
+    python3 python3Packages.lxml makeWrapper
  ];

-  # XXX: the compiler seems to treat the .h file inappropriately:
-  #
-  #    COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \
-  #            ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \
-  #           -o ${header_name}.h.gch
-  #
-  #  but using -c or -x c++-header seems to work:
-  #
-  #    COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \
-  #            -c ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \
-  #            -o ${header_name}.h.gch
-  #
-  #    COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \
-  #            -x c++-header ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \
-  #            -o ${header_name}.h.gch
-  #
-  # Might be related to:
-  #
-  #   http://permalink.gmane.org/gmane.comp.gcc.bugs/361195
-  buildCommand = ''
-    mkdir -pv $out
-    mkdir -pv ${name}/src ${name}/build ${name}/run
-    cd ${name}/src
-    unzip -n ${src}
-    sed -i \
-        -e 's|\(COMMAND\) \([^ ]\+\) \([^ ]\+\) \(.*\)|\1 \2 \3 -c \4|' \
-        cmake_extras/CustomPCH.cmake
-    cd ../build
-    cmake -G "Unix Makefiles" \
-        -DCMAKE_INSTALL_PREFIX=$out \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_BUILD_RPATH=ON \
-        ../src
-    make
-    make install
+  preFixup = ''
+    wrapProgram "$out/bin/sigil" \
+       --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml})
  '';

+  enableParallelBuilding = true;
+
  meta = {
    description = "Free, open source, multi-platform ebook (ePub) editor";
-    homepage = https://code.google.com/p/sigil/;
+    homepage = https://github.com/Sigil-Ebook/Sigil/;
    license = stdenv.lib.licenses.gpl3;
    inherit version;
+    maintainers = with stdenv.lib.maintainers; [ ramkromberg ];
  };
 }
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@ -1,19 +1,19 @@
 { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
 , boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper
-, matplotlib, pycollada, pyside, pysideTools, pysideShiboken }:
+, matplotlib, pycollada, pyside, pysideTools, pysideShiboken, pivy }:

 stdenv.mkDerivation rec {
  name = "freecad-${version}";
-  version = "0.15";
+  version = "0.16";

  src = fetchurl {
-    url = https://github.com/FreeCAD/FreeCAD/archive/0.15.tar.gz;
-    sha256 = "1vndvywvq86hyhmg629bkn5ag4lk2mg1pl4dq7jvbjvbrczb12fc";
+    url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
+    sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
  };

  buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
    zlib python swig gfortran soqt libf2c makeWrapper matplotlib
-    pycollada pyside pysideShiboken pysideTools
+    pycollada pyside pysideShiboken pysideTools pivy
  ];

  enableParallelBuilding = true;
--- a/pkgs/applications/graphics/jpegrescan/default.nix
+++ b/pkgs/applications/graphics/jpegrescan/default.nix
@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+  pname = "jpegrescan";
+  date = "2016-06-01";
+  name = "${pname}-${date}";
+
+  src = fetchFromGitHub {
+    owner = "kud";
+    repo = pname;
+    rev = "e5e39cd972b48ccfb2cba4da6855c511385c05f9";
+    sha256 = "0jbx1vzkzif6yjx1fnsm7fjsmq166sh7mn22lf01ll7s245nmpdp";
+  };
+
+  patchPhase = ''
+    patchShebangs jpegrescan
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/jpegrescan
+    mv README.md $out/share/jpegrescan/
+    mkdir $out/bin
+    mv jpegrescan $out/bin
+    chmod +x $out/bin/jpegrescan
+
+    wrapProgram $out/bin/jpegrescan --prefix PERL5LIB : $PERL5LIB
+  '';
+
+  propagatedBuildInputs = [ perlPackages.FileSlurp ];
+
+  buildInputs = [
+    perl libjpeg_turbo makeWrapper
+  ];
+
+  meta = with stdenv.lib; {
+    description = "losslessly shrink any JPEG file";
+    homepage = https://github.com/kud/jpegrescan;
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.ramkromberg ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@ -1,21 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat
+{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
+, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx 
 , mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:

 stdenv.mkDerivation rec {
-  name = "rawtherapee-4.0.10";
+  name = "rawtherapee-4.2";
  
-  src = fetchurl {
-    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
-    sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
+  src = fetchFromGitHub {
+    owner = "Beep6581";
+    repo = "RawTherapee";
+    rev = "4.2";
+    sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
  };
  
  buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
-    lcms2 libiptcdata mercurial libcanberra fftw expat ];
+    lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ];

-  # Disable the use of the RAWZOR propietary libraries
-  cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
+  patchPhase = ''
+    patch -p1 < ${./sigc++_fix.patch}
+  '';
+
+  NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";

  enableParallelBuilding = true;

@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
    description = "RAW converter and digital photo processing software";
    homepage = http://www.rawtherapee.com/;
    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [viric jcumming];
+    maintainers = with stdenv.lib.maintainers; [viric jcumming mahe];
    platforms = with stdenv.lib.platforms; linux;
  };
 }
--- a/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch
+++ b/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch
@ -0,0 +1,52 @@
+diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
+index f73dd8a..a7a069c 100644
+--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
+@@ -17,7 +17,7 @@
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "adjuster.h"
+-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
+ #include <cmath>
+ #include "multilangmgr.h"
+ #include "../rtengine/rtengine.h"
+diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
+index 134c0d7..8ce1808 100644
+--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
+@@ -16,7 +16,7 @@
+  *  You should have received a copy of the GNU General Public License
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+  */
+-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
+ #include "preferences.h"
+ #include "multilangmgr.h"
+ #include "splash.h"
+diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
+index 6b41329..19cde25 100644
+--- a/rtgui/thresholdadjuster.cc
+++ b/rtgui/thresholdadjuster.cc
+@@ -17,7 +17,7 @@
+  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "thresholdadjuster.h"
+-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
+ #include <cmath>
+ #include "multilangmgr.h"
+ #include "../rtengine/rtengine.h"
+diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
+index 2e439e1..5f14200 100644
+--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
+@@ -18,7 +18,7 @@
+  */
+ #include "tonecurve.h"
+ #include "adjuster.h"
+-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
+ #include <iomanip>
+ #include "ppversion.h"
+ #include "edit.h"
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {

  name = "cherrytree-${version}";
-  version = "0.35.9";
+  version = "0.37.1";

  src = fetchurl {
    url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac";
+    sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd";
  };

  propagatedBuildInputs = with pythonPackages;
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {

  doCheck = false;

-  meta = { 
+  meta = {
    description = "An hierarchical note taking application";
    longDescription = ''
      Cherrytree is an hierarchical note taking application,
@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
      documents. All those little bits of information you have scattered
      around your hard drive can be conveniently placed into a
      Cherrytree document where you can easily find it.
-    ''; 
+    '';
    homepage = http://www.giuspen.com/cherrytree;
    license = licenses.gpl3;
-    platforms = platforms.linux; 
-    maintainers = [ maintainers.AndersonTorres ]; 
-  }; 
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
 }
--- a/pkgs/applications/misc/cherrytree/subprocess.patch
+++ b/pkgs/applications/misc/cherrytree/subprocess.patch
@ -1,6 +1,6 @@
-diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py
--- cherrytree-0.35.6-orig/setup.py     2014-05-30 23:25:11.000000000 +0200
-+++ cherrytree-0.35.6/setup.py  2015-01-29 07:35:32.785904009 +0100
+diff -Naur cherrytree-0.37.1-orig/setup.py cherrytree-0.37.1/setup.py
+--- cherrytree-0.37.1-orig/setup.py	2016-01-08 20:50:50.000000000 +0100
+++ cherrytree-0.37.1/setup.py	2016-07-05 20:30:27.768178682 +0200
@@ -205,4 +205,9 @@
           },
        distclass=CherryTreeDist
@ -12,4 +12,3 @@ diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py
 +        pass # handle errors in the called executable
 +    except OSError:
 +        pass # executable not found
-
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@ -30,6 +30,8 @@ let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_co

  buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]);

+  propagatedUserEnvPkgs = [ gconf.out ];
+
  patchPhase = ''
    patchShebangs .
  '';
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@ -1,18 +1,21 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
  name = "iterm2-${version}";
-  version = "2.1.4";
+  version = "3.0.2";

-  src = fetchurl {
-    url = "https://iterm2.com/downloads/stable/iTerm2-2_1_4.zip";
-    sha256 = "1kb4j1p1kxj9dcsd34709bm2870ffzpq6jig6q9ixp08g0zbhqhh";
+  src = fetchFromGitHub {
+    owner = "gnachman";
+    repo = "iTerm2";
+    rev = "v${version}";
+    sha256 = "121g759i814y1g1g1jwhsmxgg4wrzv08vq7a7qwc7b85a17zbd3h";
  };

-  buildInputs = [ unzip ];
+  patches = [ ./disable_updates.patch ];
+  makeFlagsArray = ["Deployment"];
  installPhase = ''
    mkdir -p "$out/Applications"
-    mv "$(pwd)" "$out/Applications/iTerm.app"
+    mv "build/Deployment/iTerm2.app" "$out/Applications/iTerm.app"
  '';

  meta = {
--- a/pkgs/applications/misc/iterm2/disable_updates.patch
+++ b/pkgs/applications/misc/iterm2/disable_updates.patch
@ -0,0 +1,11 @@
+--- iTerm2/sources/iTermPreferences.m   2016-06-23 16:55:28.000000000 +0200
+++ iTerm2/sources/iTermPreferences.m   2016-06-23 16:55:42.000000000 +0200
+@@ -189,7 +189,7 @@
+                   kPreferenceKeyInstantReplayMemoryMegabytes: @4,
+                   kPreferenceKeySavePasteAndCommandHistory: @NO,
+                   kPreferenceKeyAddBonjourHostsToProfiles: @NO,
+-                  kPreferenceKeyCheckForUpdatesAutomatically: @YES,
+                  kPreferenceKeyCheckForUpdatesAutomatically: @NO,
+                   kPreferenceKeyCheckForTestReleases: @NO,
+                   kPreferenceKeyLoadPrefsFromCustomFolder: @NO,
+                   kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO,
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@ -8,12 +8,12 @@
 }:

 stdenv.mkDerivation rec {
-  version = "2.12";
+  version = "2.13";
  name = "links2-${version}";

  src = fetchurl {
    url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq";
+    sha256 = "c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405";
  };

  buildInputs =
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@ -39,6 +39,9 @@ stdenv.mkDerivation {
      homepage = https://mytrezor.com;
      license = licenses.unfree;
      maintainers = with maintainers; [ ehmry ];
+      # Download URL, .deb content & hash (yikes) changed, not version.
+      # New archive doesn't contain any Mozilla plugin at all.
+      broken = true;
    };

 }
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -3,6 +3,7 @@
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
 , libxml2, libxslt, ncurses, zlib
+, qtbase, qtdeclarative, qtquick1, qtwebkit
 }:

 # this package contains the daemon version of dropbox
@ -20,7 +21,8 @@
 # them with our own.

 let
-  # NOTE: When updating, please also update in current stable, as older versions stop working
+  # NOTE: When updating, please also update in current stable,
+  # as older versions stop working
  version = "4.4.29";
  sha256 =
    {
@ -42,6 +44,8 @@ let
      dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
      libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
      ncurses zlib
+
+      qtbase qtdeclarative qtquick1 qtwebkit
    ];

  desktopItem = makeDesktopItem {
@ -77,6 +81,19 @@ in stdenv.mkDerivation {
    rm "$out/${appdir}/libGL.so.1"
    rm "$out/${appdir}/libX11-xcb.so.1"

+    rm "$out/${appdir}/libQt5Core.so.5"
+    rm "$out/${appdir}/libQt5DBus.so.5"
+    rm "$out/${appdir}/libQt5Gui.so.5"
+    rm "$out/${appdir}/libQt5Network.so.5"
+    rm "$out/${appdir}/libQt5OpenGL.so.5"
+    rm "$out/${appdir}/libQt5PrintSupport.so.5"
+    rm "$out/${appdir}/libQt5Qml.so.5"
+    rm "$out/${appdir}/libQt5Quick.so.5"
+    rm "$out/${appdir}/libQt5Sql.so.5"
+    rm "$out/${appdir}/libQt5WebKit.so.5"
+    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
+    rm "$out/${appdir}/libQt5XcbQpa.so.5"
+
    mkdir -p "$out/share/applications"
    cp "${desktopItem}/share/applications/"* $out/share/applications

--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@ -4,7 +4,7 @@

 let

-  version = "2.0.3";
+  version = "2.1.0";

  rpath = stdenv.lib.makeLibraryPath [
    alsaLib
@ -42,7 +42,7 @@ let
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "0pp8n1w9kmh3pph5kc6akdswl3z2lqwryjg9d267wgj62mslr3cg";
+        sha256 = "0p9ffcy3xva1jwaafw4kw424687838s6cn5dh82ncvcr1pnyk63b";
      }
    else
      throw "Slack is not supported on ${stdenv.system}";
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  name = "diff-so-fancy-${version}";
-  version = "0.9.3";
+  version = "0.10.0";

  # perl is needed here so patchShebangs can do its job
  buildInputs = [perl makeWrapper];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner = "so-fancy";
    repo = "diff-so-fancy";
    rev = "v${version}";
-    sha256 = "0b5k54h3l4z81p6f7n14g2r5vz7qdyyrbql0z7rwhb7sw7s7zrgx";
+    sha256 = "08dv9xlrsyjr1ylm83lbsv2p5asfia4ib97bwgcacsdxxh5zyqh9";
  };

  buildPhase = null;
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@ -5,7 +5,7 @@ let
               description = "Scripts and symbols of the Aegean world"; };
    textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "06igp3hdql0yfaj9h2ahh5n7yvj2ni7rj2jdmz534f9618l8qi6r";
                  description = "Fonts based on early Greek editions"; };
-    symbola = { version = "8.00"; file = "Symbola.zip"; sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd";
+    symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5";
                description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
    aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v";
                 description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
--- a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  meta = with stdenv.lib; {
    homepage = https://wiki.gnome.org/Apps/Cheese;
--- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
@ -1,17 +1,16 @@
 { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }:
+, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

  buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
-                  gnome3.dconf ];
+                  gnome3.dconf libnotify nautilus ];
+
+  installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];

  meta = with stdenv.lib; {
    homepage = https://wiki.gnome.org/Apps/FileRoller;
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  buildInputs = [
    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  preFixup = ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"

    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
  '';
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                  gnome3.geocode_glib libchamplain file libsoup
                  gdk_pixbuf librsvg autoreconfHook
+                  gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
                  gnome3.gnome_online_accounts gnome3.defaultIconTheme ];

  patches = [ ./soup.patch ];
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

  # doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
--- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
--- a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

--- a/pkgs/desktops/gnome-3/3.20/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/evince/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    (if supportXPS then "--enable-xps" else "--disable-xps")
  ];

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  preConfigure = with stdenv.lib;
    optionalString doCheck ''
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

--- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  enableParallelBuilding = true;

--- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

--- a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

--- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];

  configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path
    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
    "--with-pkcs11-modules=$$out/lib/pkcs11/"
  ];
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

  buildInputs = with gnome3;
    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
+, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
 , sqlite, libgweather, libcanberra_gtk3
 , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
@ -15,16 +15,18 @@ stdenv.mkDerivation rec {

  buildInputs = with gnome3;
    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
+      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg
      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
+      libical libtool nss gtk gstreamer makeWrapper gdm
      libcanberra_gtk3 gnome_control_center
      defaultIconTheme sqlite gnome3.gnome-bluetooth
      libgweather # not declared at build time, but typelib is needed at runtime
      gnome3.gnome-clocks # schemas needed
      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];

+  propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];
+
  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];

  preBuild = ''
@ -40,6 +42,9 @@ stdenv.mkDerivation rec {
      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

+    wrapProgram "$out/bin/gnome-shell-extension-tool" \
+      --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
+
    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

--- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  preConfigure = ''
    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  postInstall = ''
    mkdir -p $out/share/gsettings-schemas/$name
    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+    ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
  '';

  preFixup = ''
--- a/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
@ -4,12 +4,12 @@

 stdenv.mkDerivation rec {
  major = "0.3";
-  minor = "1";
+  minor = "2";
  name = "grilo-plugins-${major}.${minor}";

  src = fetchurl {
    url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
-    sha256 = "1akd7q6pqnkcnayrdfjb0qx5w5yyl06kxzwhqp2gxm4y1b208pb0";
+    sha256 = "1z8s62a29zidm35ajf708r7d36glb27im4s52l02q9w1jwl8j6vr";
  };

  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
--- a/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
+, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:

 stdenv.mkDerivation rec {
-  major = "0.3";
-  minor = "0";
+  major = "0.3"; # if you change this, also change ./setup-hook.sh
+  minor = "1";
  name = "grilo-${major}.${minor}";

  src = fetchurl {
    url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "0q5wcvnckpfks48hy0gvlfdmvqm67vnblm3912rssmkgc1ysil8z";
+    sha256 = "0k6d8drgh7inbpxqfa9m9dm4vrhfb9ifi5b88fn8q2ljqwfwdggb";
  };

  setupHook = ./setup-hook.sh;
@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
  '';

  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser gobjectIntrospection ];
+                  gnome3.totem-pl-parser ];
+
+  propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];

  meta = with stdenv.lib; {
    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
--- a/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
+++ b/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
@ -1,6 +1,6 @@
 make_grilo_find_plugins() {
-    if [ -d "$1"/lib/grilo-0.2 ]; then
-        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2"
+    if [ -d "$1"/lib/grilo-0.3 ]; then
+        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3"
    fi
 }

--- a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glib }:

 stdenv.mkDerivation rec {
-  name = "libcroco-0.6.8";
+  name = "libcroco-0.6.11";

  src = fetchurl {
    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
+    sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
  };

  outputs = [ "dev" "out" ];
--- a/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz";
  };

-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";

  buildInputs = with gnome3;
    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
--- a/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
@ -1,14 +1,13 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python, pygobject3
+, glib, gtk3, gobjectIntrospection, python3Packages, ncurses
 }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  buildInputs =  [
-   intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
-   gnome3.defaultIconTheme
-  ];
+  configureFlags = [ "--enable-python3" ];
+
+  buildInputs =  [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];

  meta = with stdenv.lib; {
    description = "A GObject-based plugins engine";
--- a/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
@ -1,10 +1,13 @@
 # Autogenerated by maintainers/scripts/gnome.sh update

-fetchurl: {
-  name = "libpeas-1.16.0";
+fetchurl: rec {
+  major = "1.18";
+  minor = "0";
+  version = "${major}.${minor}";
+  name = "libpeas-${version}";

  src = fetchurl {
-    url = mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz;
-    sha256 = "b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e";
+    url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
+    sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
  };
 }
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 

--- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
@ -1,8 +1,8 @@
 { stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
+, clutter_gtk, clutter-gst, python3Packages, shared_mime_info
+, pkgconfig, gtk3, glib, gobjectIntrospection
+, bash, wrapGAppsHook, itstool, libxml2, dbus_glib
+, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;
@ -11,29 +11,28 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav
+                  gnome3.libpeas shared_mime_info dbus_glib
                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/totem" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ];

  patches = [ ./x86.patch ];

+  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject ];
+
+  configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+  GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
+
+  wrapPrefixVariables = [ "PYTHONPATH" ];
+
  meta = with stdenv.lib; {
    homepage = https://wiki.gnome.org/Apps/Videos;
    description = "Movie player for the GNOME desktop based on GStreamer";
--- a/pkgs/desktops/gnome-3/3.20/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/default.nix
@ -385,6 +385,8 @@ let

  gpaste = callPackage ./misc/gpaste { };

+  pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
+  
  gtkhtml = callPackage ./misc/gtkhtml { };

  pomodoro = callPackage ./misc/pomodoro { };
--- a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+  version = "1.0";
+  basename = "pidgin-im-gnome-shell-extension";
+  name = "${basename}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "muffinmad";
+    repo = "${basename}";
+    rev = "v${version}";
+    sha256 = "0vj4w9qqx9gads24w3f6v6mfh5va28bp8rc4w7lz0vhp7njmy1yy";
+  };
+
+  buildInputs = [ glib ];
+
+  configurePhase = "";
+  buildPhase = "";
+  installPhase = ''
+    share_dir="$prefix/share"
+    extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
+    mkdir -p "$extensions_dir"
+    mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir"
+
+    schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
+    mkdir -p "$schemas_dir"
+    mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
+    ${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
+
+    locale_dir="$share_dir/locale"
+    mkdir -p "$locale_dir"
+    mv locale/* $locale_dir # fix Emacs syntax highlighting: */
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension;
+    description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ DamienCassou ];
+  };
+}
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@ -49,10 +49,12 @@ let
    kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
    khelpcenter = callPackage ./khelpcenter.nix {};
    kio-extras = callPackage ./kio-extras.nix {};
+    kompare = callPackage ./kompare.nix {};
    konsole = callPackage ./konsole.nix {};
    libkdcraw = callPackage ./libkdcraw.nix {};
    libkexiv2 = callPackage ./libkexiv2.nix {};
    libkipi = callPackage ./libkipi.nix {};
+    libkomparediff2 = callPackage ./libkomparediff2.nix {};
    okular = callPackage ./okular.nix {};
    print-manager = callPackage ./print-manager.nix {};
    spectacle = callPackage ./spectacle.nix {};
--- a/pkgs/desktops/kde-5/applications-16.04/kompare.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kompare.nix
@ -0,0 +1,34 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, kparts
+, ktexteditor
+, kwidgetsaddons
+, libkomparediff2
+}:
+
+kdeApp {
+  name = "kompare";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+  };
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+
+  propagatedBuildInputs = [
+    kparts
+    ktexteditor
+    kwidgetsaddons
+    libkomparediff2
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/kompare"
+  '';
+}
--- a/pkgs/desktops/kde-5/applications-16.04/libkomparediff2.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkomparediff2.nix
@ -0,0 +1,23 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, ki18n
+, kxmlgui
+, kcodecs
+, kio
+}:
+
+kdeApp {
+  name = "libkomparediff2";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+
+  propagatedBuildInputs = [
+    kcodecs
+    ki18n
+    kxmlgui
+    kio
+  ];
+}
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/pkgs/development/compilers/opendylan/default.nix
@ -1,5 +1,5 @@
 # Build Open Dylan from source using the binary builds to bootstrap.
-{stdenv, fetchgit, patchelf, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
+{stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:

 stdenv.mkDerivation {
  name = "opendylan-2013.2";
@ -24,7 +24,7 @@ stdenv.mkDerivation {
    ./autogen.sh
  '';

-  configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.dev}";
+  configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}";
  buildPhase = "make 3-stage-bootstrap";

  postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";
@ -33,5 +33,6 @@ stdenv.mkDerivation {
    homepage = http://opendylan.org;
    description = "A multi-paradigm functional and object-oriented programming language";
    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -653,9 +653,6 @@ self: super: {
  # Test suite won't compile against tasty-hunit 0.9.x.
  zlib = dontCheck super.zlib;

-  # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
-
  # https://github.com/ndmitchell/shake/issues/206
  # https://github.com/ndmitchell/shake/issues/267
  shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -5101,6 +5101,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5388,6 +5389,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5784,6 +5786,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6060,6 +6063,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6096,6 +6100,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6207,6 +6212,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6958,6 +6964,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7107,6 +7114,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7824,6 +7832,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8109,6 +8118,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8437,6 +8447,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_15";
  "system-filepath" = doDistribute super."system-filepath_0_4_12";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8445,6 +8456,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8599,6 +8611,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9230,6 +9243,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9267,6 +9281,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9520,6 +9535,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_5";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -5101,6 +5101,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5388,6 +5389,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5784,6 +5786,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6060,6 +6063,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6096,6 +6100,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6207,6 +6212,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6958,6 +6964,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7107,6 +7114,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7824,6 +7832,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8109,6 +8118,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8437,6 +8447,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_15";
  "system-filepath" = doDistribute super."system-filepath_0_4_12";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8445,6 +8456,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8599,6 +8611,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9230,6 +9243,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9267,6 +9281,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9520,6 +9535,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_5";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -5101,6 +5101,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5388,6 +5389,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5784,6 +5786,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6060,6 +6063,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6096,6 +6100,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6207,6 +6212,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6958,6 +6964,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7107,6 +7114,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7824,6 +7832,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8109,6 +8118,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8437,6 +8447,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_15";
  "system-filepath" = doDistribute super."system-filepath_0_4_12";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8445,6 +8456,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8599,6 +8611,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9230,6 +9243,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9267,6 +9281,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9520,6 +9535,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_5";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -5101,6 +5101,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5388,6 +5389,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5784,6 +5786,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6060,6 +6063,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6096,6 +6100,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6207,6 +6212,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6958,6 +6964,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7107,6 +7114,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7824,6 +7832,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8109,6 +8118,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8437,6 +8447,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_15";
  "system-filepath" = doDistribute super."system-filepath_0_4_12";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8445,6 +8456,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8599,6 +8611,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9230,6 +9243,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9267,6 +9281,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9520,6 +9535,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_5";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -5099,6 +5099,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5386,6 +5387,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5782,6 +5784,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6058,6 +6061,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6094,6 +6098,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6205,6 +6210,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6956,6 +6962,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7105,6 +7112,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7821,6 +7829,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8106,6 +8115,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8434,6 +8444,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8442,6 +8453,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8596,6 +8608,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9227,6 +9240,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9264,6 +9278,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9517,6 +9532,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -5099,6 +5099,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5386,6 +5387,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5782,6 +5784,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6058,6 +6061,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6094,6 +6098,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6205,6 +6210,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6956,6 +6962,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7105,6 +7112,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7821,6 +7829,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8106,6 +8115,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8434,6 +8444,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8442,6 +8453,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8596,6 +8608,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9227,6 +9240,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9264,6 +9278,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9517,6 +9532,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -5097,6 +5097,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5384,6 +5385,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5780,6 +5782,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6056,6 +6059,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6092,6 +6096,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6203,6 +6208,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6954,6 +6960,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7103,6 +7110,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7818,6 +7826,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8103,6 +8112,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8431,6 +8441,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8439,6 +8450,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8593,6 +8605,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9224,6 +9237,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9261,6 +9275,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9513,6 +9528,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -5097,6 +5097,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5384,6 +5385,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5780,6 +5782,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6056,6 +6059,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6092,6 +6096,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6203,6 +6208,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_6_3";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6954,6 +6960,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_1_1";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7103,6 +7110,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7818,6 +7826,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8103,6 +8112,7 @@ self: super: {
  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8431,6 +8441,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8439,6 +8450,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8593,6 +8605,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9224,6 +9237,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9261,6 +9275,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9513,6 +9528,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -5090,6 +5090,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5377,6 +5378,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5773,6 +5775,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6049,6 +6052,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6085,6 +6089,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6196,6 +6201,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6947,6 +6953,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7096,6 +7103,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7810,6 +7818,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8094,6 +8103,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8422,6 +8432,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8430,6 +8441,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8584,6 +8596,7 @@ self: super: {
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
  "text-icu" = doDistribute super."text-icu_0_7_0_0";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9214,6 +9227,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9251,6 +9265,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9503,6 +9518,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -5084,6 +5084,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5371,6 +5372,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5767,6 +5769,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6043,6 +6046,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6078,6 +6082,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6189,6 +6194,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6940,6 +6946,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7089,6 +7096,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7803,6 +7811,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8086,6 +8095,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8413,6 +8423,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8421,6 +8432,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8573,6 +8585,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9203,6 +9216,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9240,6 +9254,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9492,6 +9507,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -5068,6 +5068,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
@ -5355,6 +5356,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5750,6 +5752,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6026,6 +6029,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6061,6 +6065,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6172,6 +6177,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6921,6 +6927,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7070,6 +7077,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7783,6 +7791,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8065,6 +8074,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8392,6 +8402,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_1";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8400,6 +8411,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8550,6 +8562,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9177,6 +9190,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9214,6 +9228,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9464,6 +9479,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -5066,6 +5066,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
@ -5352,6 +5353,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5747,6 +5749,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6023,6 +6026,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6058,6 +6062,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6169,6 +6174,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6918,6 +6924,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7067,6 +7074,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7780,6 +7788,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8062,6 +8071,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8389,6 +8399,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_1";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8397,6 +8408,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8547,6 +8559,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9174,6 +9187,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9211,6 +9225,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9461,6 +9476,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -5066,6 +5066,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5352,6 +5353,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5747,6 +5749,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6023,6 +6026,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6058,6 +6062,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6169,6 +6174,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6918,6 +6924,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7067,6 +7074,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7780,6 +7788,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8062,6 +8071,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8389,6 +8399,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_1";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8397,6 +8408,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8547,6 +8559,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9174,6 +9187,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9211,6 +9225,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9461,6 +9476,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -5065,6 +5065,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5351,6 +5352,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5746,6 +5748,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6022,6 +6025,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6057,6 +6061,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6168,6 +6173,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6917,6 +6923,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7066,6 +7073,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7779,6 +7787,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8061,6 +8070,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8388,6 +8398,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_1";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8396,6 +8407,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8545,6 +8557,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9172,6 +9185,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9209,6 +9223,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9459,6 +9474,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -5062,6 +5062,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5348,6 +5349,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5743,6 +5745,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6019,6 +6022,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6054,6 +6058,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6165,6 +6170,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6914,6 +6920,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7063,6 +7070,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7775,6 +7783,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8057,6 +8066,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8384,6 +8394,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_1";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8392,6 +8403,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8541,6 +8553,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9168,6 +9181,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9205,6 +9219,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9455,6 +9470,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -5059,6 +5059,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5345,6 +5346,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5740,6 +5742,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6016,6 +6019,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6051,6 +6055,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6162,6 +6167,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6909,6 +6915,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7058,6 +7065,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7769,6 +7777,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8051,6 +8060,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8377,6 +8387,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8385,6 +8396,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8534,6 +8546,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9161,6 +9174,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9198,6 +9212,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9447,6 +9462,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -5081,6 +5081,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
@ -5368,6 +5369,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5764,6 +5766,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6040,6 +6043,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6075,6 +6079,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6186,6 +6191,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6936,6 +6942,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7085,6 +7092,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7798,6 +7806,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8081,6 +8090,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8408,6 +8418,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8416,6 +8427,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8568,6 +8580,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9198,6 +9211,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9235,6 +9249,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9487,6 +9502,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -5078,6 +5078,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_1";
@ -5365,6 +5366,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5761,6 +5763,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6037,6 +6040,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6072,6 +6076,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6183,6 +6188,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6932,6 +6938,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7081,6 +7088,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7794,6 +7802,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8077,6 +8086,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8404,6 +8414,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8412,6 +8423,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8563,6 +8575,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9193,6 +9206,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9230,6 +9244,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9482,6 +9497,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -5077,6 +5077,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_1";
@ -5364,6 +5365,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5760,6 +5762,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6036,6 +6039,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6071,6 +6075,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6182,6 +6187,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6931,6 +6937,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7080,6 +7087,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7793,6 +7801,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8076,6 +8085,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8403,6 +8413,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8411,6 +8422,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8562,6 +8574,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9190,6 +9203,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9227,6 +9241,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9479,6 +9494,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -5072,6 +5072,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
@ -5359,6 +5360,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5755,6 +5757,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6031,6 +6034,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6066,6 +6070,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6177,6 +6182,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6926,6 +6932,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7075,6 +7082,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7788,6 +7796,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8071,6 +8080,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8398,6 +8408,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_1";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8406,6 +8417,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8557,6 +8569,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9185,6 +9198,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9222,6 +9236,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9474,6 +9489,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -5069,6 +5069,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
@ -5356,6 +5357,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5751,6 +5753,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6027,6 +6030,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6062,6 +6066,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6173,6 +6178,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6922,6 +6928,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7071,6 +7078,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7784,6 +7792,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8067,6 +8076,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8394,6 +8404,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8402,6 +8413,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8553,6 +8565,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9180,6 +9193,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9217,6 +9231,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9469,6 +9484,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -5068,6 +5068,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
@ -5355,6 +5356,7 @@ self: super: {
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5750,6 +5752,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -6026,6 +6029,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6061,6 +6065,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6172,6 +6177,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_7_0";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6921,6 +6927,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7070,6 +7077,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7783,6 +7791,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8066,6 +8075,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8393,6 +8403,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8401,6 +8412,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8552,6 +8564,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9179,6 +9192,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_3";
@ -9216,6 +9230,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9468,6 +9483,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_6";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -5042,6 +5042,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5324,6 +5325,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5715,6 +5717,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5989,6 +5992,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6024,6 +6028,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6131,6 +6136,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6873,6 +6879,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7023,6 +7030,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7733,6 +7741,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8011,6 +8020,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8335,6 +8345,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8343,6 +8354,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8492,6 +8504,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9117,6 +9130,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9153,6 +9167,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9398,6 +9413,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -5042,6 +5042,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5324,6 +5325,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5715,6 +5717,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5989,6 +5992,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6024,6 +6028,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6131,6 +6136,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6873,6 +6879,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7023,6 +7030,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7733,6 +7741,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8011,6 +8020,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8335,6 +8345,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8343,6 +8354,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8492,6 +8504,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9117,6 +9130,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9153,6 +9167,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9398,6 +9413,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -5026,6 +5026,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5306,6 +5307,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5696,6 +5698,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5970,6 +5973,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6005,6 +6009,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6112,6 +6117,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6853,6 +6859,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7003,6 +7010,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7710,6 +7718,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7987,6 +7996,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8304,6 +8314,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8312,6 +8323,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8461,6 +8473,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9084,6 +9097,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9120,6 +9134,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9363,6 +9378,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -5025,6 +5025,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5305,6 +5306,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5695,6 +5697,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5969,6 +5972,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6004,6 +6008,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6111,6 +6116,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6851,6 +6857,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7001,6 +7008,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7707,6 +7715,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7984,6 +7993,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8300,6 +8310,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8308,6 +8319,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8457,6 +8469,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9080,6 +9093,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9116,6 +9130,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9359,6 +9374,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -5025,6 +5025,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5305,6 +5306,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5695,6 +5697,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5969,6 +5972,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6004,6 +6008,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6111,6 +6116,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6851,6 +6857,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7001,6 +7008,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7706,6 +7714,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7983,6 +7992,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8299,6 +8309,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8307,6 +8318,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8456,6 +8468,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9079,6 +9092,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9115,6 +9129,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9358,6 +9373,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -5025,6 +5025,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5304,6 +5305,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5694,6 +5696,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5968,6 +5971,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6003,6 +6007,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6110,6 +6115,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6850,6 +6856,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7000,6 +7007,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7705,6 +7713,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7982,6 +7991,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8298,6 +8308,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8306,6 +8317,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8455,6 +8467,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9078,6 +9091,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9114,6 +9128,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9357,6 +9372,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -5023,6 +5023,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5302,6 +5303,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5692,6 +5694,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5966,6 +5969,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6001,6 +6005,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6108,6 +6113,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6848,6 +6854,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6998,6 +7005,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7703,6 +7711,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7980,6 +7989,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8296,6 +8306,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8304,6 +8315,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8453,6 +8465,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9076,6 +9089,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9112,6 +9126,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9354,6 +9369,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@ -5022,6 +5022,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5301,6 +5302,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5691,6 +5693,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5965,6 +5968,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6000,6 +6004,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6106,6 +6111,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6846,6 +6852,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6996,6 +7003,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7701,6 +7709,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7978,6 +7987,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8293,6 +8303,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8301,6 +8312,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8450,6 +8462,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9073,6 +9086,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9109,6 +9123,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9351,6 +9366,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@ -5019,6 +5019,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5298,6 +5299,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5687,6 +5689,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5961,6 +5964,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5996,6 +6000,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6102,6 +6107,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6842,6 +6848,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6992,6 +6999,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7697,6 +7705,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7974,6 +7983,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8289,6 +8299,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8297,6 +8308,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8446,6 +8458,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9069,6 +9082,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9105,6 +9119,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9347,6 +9362,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@ -5016,6 +5016,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5295,6 +5296,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5684,6 +5686,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5958,6 +5961,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5993,6 +5997,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6099,6 +6104,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6838,6 +6844,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6988,6 +6995,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7693,6 +7701,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7970,6 +7979,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8285,6 +8295,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8293,6 +8304,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8442,6 +8454,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9065,6 +9078,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9101,6 +9115,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9343,6 +9358,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@ -5014,6 +5014,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5293,6 +5294,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5682,6 +5684,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5956,6 +5959,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5991,6 +5995,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6097,6 +6102,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6835,6 +6841,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6985,6 +6992,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7690,6 +7698,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7967,6 +7976,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8282,6 +8292,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8290,6 +8301,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8439,6 +8451,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9062,6 +9075,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9098,6 +9112,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9339,6 +9354,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@ -5013,6 +5013,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5292,6 +5293,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5681,6 +5683,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5955,6 +5958,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5990,6 +5994,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6096,6 +6101,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6834,6 +6840,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6984,6 +6991,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7689,6 +7697,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7966,6 +7975,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8281,6 +8291,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8289,6 +8300,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8438,6 +8450,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9061,6 +9074,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9097,6 +9111,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9338,6 +9353,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@ -5040,6 +5040,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5322,6 +5323,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5713,6 +5715,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5987,6 +5990,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6022,6 +6026,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6129,6 +6134,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6871,6 +6877,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7021,6 +7028,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7731,6 +7739,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8009,6 +8018,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8333,6 +8343,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8341,6 +8352,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8490,6 +8502,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9115,6 +9128,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9151,6 +9165,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9395,6 +9410,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@ -5013,6 +5013,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5292,6 +5293,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5681,6 +5683,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5955,6 +5958,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5990,6 +5994,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6096,6 +6101,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6834,6 +6840,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6984,6 +6991,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7689,6 +7697,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7965,6 +7974,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8280,6 +8290,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8288,6 +8299,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8437,6 +8449,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9060,6 +9073,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9096,6 +9110,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9337,6 +9352,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@ -5013,6 +5013,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5292,6 +5293,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5681,6 +5683,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5955,6 +5958,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5990,6 +5994,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6096,6 +6101,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6834,6 +6840,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6983,6 +6990,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7688,6 +7696,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7964,6 +7973,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8279,6 +8289,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8287,6 +8298,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8436,6 +8448,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9059,6 +9072,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9095,6 +9109,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9336,6 +9351,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@ -5012,6 +5012,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5291,6 +5292,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5680,6 +5682,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5954,6 +5957,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -5989,6 +5993,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6095,6 +6100,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_2_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6833,6 +6839,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2_0_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -6982,6 +6989,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7687,6 +7695,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -7963,6 +7972,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8278,6 +8288,7 @@ self: super: {
  "system-argv0" = dontDistribute super."system-argv0";
  "system-command" = dontDistribute super."system-command";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8286,6 +8297,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8435,6 +8447,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9058,6 +9071,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
@ -9094,6 +9108,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9335,6 +9350,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_8";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@ -5038,6 +5038,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5320,6 +5321,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5711,6 +5713,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5985,6 +5988,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6020,6 +6024,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6127,6 +6132,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6869,6 +6875,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7019,6 +7026,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7729,6 +7737,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8007,6 +8016,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8331,6 +8341,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8339,6 +8350,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8488,6 +8500,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9113,6 +9126,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9149,6 +9163,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9393,6 +9408,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@ -5038,6 +5038,7 @@ self: super: {
  "hyperdrive" = dontDistribute super."hyperdrive";
  "hyperfunctions" = dontDistribute super."hyperfunctions";
  "hyperloglog" = dontDistribute super."hyperloglog";
+  "hyperloglogplus" = dontDistribute super."hyperloglogplus";
  "hyperpublic" = dontDistribute super."hyperpublic";
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
@ -5320,6 +5321,7 @@ self: super: {
  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
  "jsc" = dontDistribute super."jsc";
  "jsmw" = dontDistribute super."jsmw";
+  "json-api" = dontDistribute super."json-api";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
@ -5711,6 +5713,7 @@ self: super: {
  "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-transformer" = dontDistribute super."list-transformer";
  "list-tries" = dontDistribute super."list-tries";
  "list-zip-def" = dontDistribute super."list-zip-def";
  "listlike-instances" = dontDistribute super."listlike-instances";
@ -5985,6 +5988,7 @@ self: super: {
  "microlens-mtl" = dontDistribute super."microlens-mtl";
  "microlens-platform" = dontDistribute super."microlens-platform";
  "microlens-th" = dontDistribute super."microlens-th";
+  "micrologger" = dontDistribute super."micrologger";
  "microtimer" = dontDistribute super."microtimer";
  "mida" = dontDistribute super."mida";
  "midair" = dontDistribute super."midair";
@ -6020,6 +6024,7 @@ self: super: {
  "minisat" = dontDistribute super."minisat";
  "ministg" = dontDistribute super."ministg";
  "miniutter" = dontDistribute super."miniutter";
+  "minlen" = dontDistribute super."minlen";
  "minst-idx" = dontDistribute super."minst-idx";
  "mirror-tweet" = dontDistribute super."mirror-tweet";
  "misfortune" = dontDistribute super."misfortune";
@ -6127,6 +6132,7 @@ self: super: {
  "monitor" = dontDistribute super."monitor";
  "mono-foldable" = dontDistribute super."mono-foldable";
  "mono-traversable" = doDistribute super."mono-traversable_0_9_1";
+  "mono-traversable-instances" = dontDistribute super."mono-traversable-instances";
  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
  "monoid-extras" = doDistribute super."monoid-extras_0_3_3_5";
  "monoid-owns" = dontDistribute super."monoid-owns";
@ -6868,6 +6874,7 @@ self: super: {
  "pngload-fixed" = dontDistribute super."pngload-fixed";
  "pnm" = dontDistribute super."pnm";
  "pocket-dns" = dontDistribute super."pocket-dns";
+  "point-octree" = dontDistribute super."point-octree";
  "pointed" = doDistribute super."pointed_4_2";
  "pointedlist" = dontDistribute super."pointedlist";
  "pointfree" = dontDistribute super."pointfree";
@ -7018,6 +7025,7 @@ self: super: {
  "process-qq" = dontDistribute super."process-qq";
  "process-streaming" = dontDistribute super."process-streaming";
  "processing" = dontDistribute super."processing";
+  "processing-for-haskell" = dontDistribute super."processing-for-haskell";
  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
@ -7727,6 +7735,7 @@ self: super: {
  "servant-swagger" = dontDistribute super."servant-swagger";
  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
  "servant-yaml" = dontDistribute super."servant-yaml";
+  "server-generic" = dontDistribute super."server-generic";
  "serversession" = dontDistribute super."serversession";
  "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
  "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
@ -8005,6 +8014,7 @@ self: super: {
  "socketson" = dontDistribute super."socketson";
  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
+  "solga" = dontDistribute super."solga";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
  "sophia" = dontDistribute super."sophia";
@ -8329,6 +8339,7 @@ self: super: {
  "system-fileio" = doDistribute super."system-fileio_0_3_16_2";
  "system-filepath" = doDistribute super."system-filepath_0_4_13_2";
  "system-gpio" = dontDistribute super."system-gpio";
+  "system-info" = dontDistribute super."system-info";
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
@ -8337,6 +8348,7 @@ self: super: {
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
  "systemd" = dontDistribute super."systemd";
+  "systemstats" = dontDistribute super."systemstats";
  "syz" = dontDistribute super."syz";
  "t-regex" = dontDistribute super."t-regex";
  "t3-client" = dontDistribute super."t3-client";
@ -8486,6 +8498,7 @@ self: super: {
  "text-binary" = doDistribute super."text-binary_0_1_0";
  "text-conversions" = dontDistribute super."text-conversions";
  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-normalized" = dontDistribute super."text-icu-normalized";
  "text-icu-translit" = dontDistribute super."text-icu-translit";
  "text-json-qq" = dontDistribute super."text-json-qq";
  "text-latin1" = dontDistribute super."text-latin1";
@ -9111,6 +9124,7 @@ self: super: {
  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
  "wai-hastache" = dontDistribute super."wai-hastache";
  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-http2-extra" = dontDistribute super."wai-http2-extra";
  "wai-lens" = dontDistribute super."wai-lens";
  "wai-lite" = dontDistribute super."wai-lite";
  "wai-logger" = doDistribute super."wai-logger_2_2_4";
@ -9147,6 +9161,7 @@ self: super: {
  "wai-session" = dontDistribute super."wai-session";
  "wai-session-alt" = dontDistribute super."wai-session-alt";
  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-mysql" = dontDistribute super."wai-session-mysql";
  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
  "wai-static-cache" = dontDistribute super."wai-static-cache";
@ -9391,6 +9406,7 @@ self: super: {
  "yabi" = dontDistribute super."yabi";
  "yabi-muno" = dontDistribute super."yabi-muno";
  "yackage" = doDistribute super."yackage_0_7_0_7";
+  "yahoo-finance-api" = dontDistribute super."yahoo-finance-api";
  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
  "yajl" = dontDistribute super."yajl";
--- a/Show More
+++ b/Show More