Merge branch 'master' into staging

2016-05-12 04:03:33 +02:00 · 2016-05-12 04:03:33 +02:00 · 6c2fbfbd77
commit 6c2fbfbd77
parent 81df035429 3d932ba135
222 changed files with 17737 additions and 11667 deletions
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@ -534,6 +534,7 @@ All parameters from `mkDerivation` function are still supported.
 * `postShellHook`: Hook to execute commands after `shellHook`.
 * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
 * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
+* `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`.

 #### `buildPythonApplication` function

--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -221,6 +221,7 @@
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
  markus1189 = "Markus Hauck <markus1189@gmail.com>";
  markWot = "Markus Wotringer <markus@wotringer.de>";
+  martijnvermaat = "Martijn Vermaat <martijn@vermaat.name>";
  matejc = "Matej Cotman <cotman.matej@gmail.com>";
  mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
  matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
@ -236,6 +237,7 @@
  michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
  mingchuan = "Ming Chuan <ming@culpring.com>";
  mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
+  mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
  modulistic = "Pablo Costa <modulistic@gmail.com>";
  mog = "Matthew O'Gorman <mog-lists@rldn.net>";
  moosingin3space = "Nathan Moos <moosingin3space@gmail.com>";
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@ -5,7 +5,7 @@
 # content-addressed cache used by fetchurl as a fallback for when
 # upstream tarballs disappear or change. Usage:
 #
-# 1) To upload a single file:
+# 1) To upload one or more files:
 #
 #    $ copy-tarballs.pl --file /path/to/tarball.tar.gz
 #
@ -22,12 +22,38 @@ use JSON;
 use Net::Amazon::S3;
 use Nix::Store;

-isValidPath("/nix/store/foo"); # FIXME: forces Nix::Store initialisation
+isValidPath("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo"); # FIXME: forces Nix::Store initialisation
+
+sub usage {
+    die "Syntax: $0 [--dry-run] [--exclude REGEXP] [--expr EXPR | --file FILES...]\n";
+}
+
+my $dryRun = 0;
+my $expr;
+my @fileNames;
+my $exclude;
+
+while (@ARGV) {
+    my $flag = shift @ARGV;
+
+    if ($flag eq "--expr") {
+        $expr = shift @ARGV or die "--expr requires an argument";
+    } elsif ($flag eq "--file") {
+        @fileNames = @ARGV;
+        last;
+    } elsif ($flag eq "--dry-run") {
+        $dryRun = 1;
+    } elsif ($flag eq "--exclude") {
+        $exclude = shift @ARGV or die "--exclude requires an argument";
+    } else {
+        usage();
+    }
+}


 # S3 setup.
-my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die;
-my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die;
+my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n";
+my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n";

 my $s3 = Net::Amazon::S3->new(
    { aws_access_key_id     => $aws_access_key_id,
@ -37,12 +63,15 @@ my $s3 = Net::Amazon::S3->new(

 my $bucket = $s3->bucket("nixpkgs-tarballs") or die;

-my $cacheFile = "/tmp/copy-tarballs-cache";
+my $doWrite = 0;
+my $cacheFile = ($ENV{"HOME"} or die "\$HOME is not set") . "/.cache/nix/copy-tarballs";
 my %cache;
 $cache{$_} = 1 foreach read_file($cacheFile, err_mode => 'quiet', chomp => 1);
+$doWrite = 1;

 END() {
-    write_file($cacheFile, map { "$_\n" } keys %cache);
+    File::Path::mkpath(dirname($cacheFile), 0, 0755);
+    write_file($cacheFile, map { "$_\n" } keys %cache) if $doWrite;
 }

 sub alreadyMirrored {
@ -87,11 +116,9 @@ sub uploadFile {
    $cache{$mainKey} = 1;
 }

-my $op = shift @ARGV;
-
-if ($op eq "--file") {
+if (scalar @fileNames) {
    my $res = 0;
-    foreach my $fn (@ARGV) {
+    foreach my $fn (@fileNames) {
        eval {
            if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) {
                print STDERR "$fn is already mirrored\n";
@ -100,17 +127,16 @@ if ($op eq "--file") {
            }
        };
        if ($@) {
-            warn "$@\n";
+            warn "$@";
            $res = 1;
        }
    }
    exit $res;
 }

-elsif ($op eq "--expr") {
+elsif (defined $expr) {

    # Evaluate find-tarballs.nix.
-    my $expr = $ARGV[0] // die "$0: --expr requires a Nix expression\n";
    my $pid = open(JSON, "-|", "nix-instantiate", "--eval", "--json", "--strict",
                   "<nixpkgs/maintainers/scripts/find-tarballs.nix>",
                   "--arg", "expr", $expr);
@ -126,7 +152,7 @@ elsif ($op eq "--expr") {
    # Check every fetchurl call discovered by find-tarballs.nix.
    my $mirrored = 0;
    my $have = 0;
-    foreach my $fetch (@{$fetches}) {
+    foreach my $fetch (sort { $a->{url} cmp $b->{url} } @{$fetches}) {
        my $url = $fetch->{url};
        my $algo = $fetch->{type};
        my $hash = $fetch->{hash};
@ -142,6 +168,8 @@ elsif ($op eq "--expr") {
            next;
        }

+        next if defined $exclude && $url =~ /$exclude/;
+
        if (alreadyMirrored($algo, $hash)) {
            $have++;
            next;
@ -151,7 +179,10 @@ elsif ($op eq "--expr") {

        print STDERR "mirroring $url ($storePath)...\n";

-        next if $ENV{DRY_RUN};
+        if ($dryRun) {
+            $mirrored++;
+            next;
+        }

        # Substitute the output.
        if (!isValidPath($storePath)) {
@ -184,5 +215,5 @@ elsif ($op eq "--expr") {
 }

 else {
-    die "Syntax: $0 --file FILENAMES... | --expr EXPR\n";
+    usage();
 }
--- a/nixos/modules/config/krb5.nix
+++ b/nixos/modules/config/krb5.nix
@ -173,6 +173,8 @@ in
            ${cfg.domainRealm} = ${cfg.defaultRealm}
            .mit.edu = ATHENA.MIT.EDU
            mit.edu = ATHENA.MIT.EDU
+            .exchange.mit.edu = EXCHANGE.MIT.EDU
+            exchange.mit.edu = EXCHANGE.MIT.EDU
            .media.mit.edu = MEDIA-LAB.MIT.EDU
            media.mit.edu = MEDIA-LAB.MIT.EDU
            .csail.mit.edu = CSAIL.MIT.EDU
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@ -40,6 +40,7 @@ let
      pkgs.time
      pkgs.texinfoInteractive
      pkgs.utillinux
+      pkgs.which # 88K size
    ];

 in
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@ -5,14 +5,21 @@ with lib;
 # unixODBC drivers (this solution is not perfect.. Because the user has to
 # ask the admin to add a driver.. but it's simple and works

-{
+let
+  iniDescription = pkg: ''
+    [${pkg.fancyName}]
+    Description = ${pkg.meta.description}
+    Driver = ${pkg}/${pkg.driver}
+  '';
+
+in {
  ###### interface

  options = {
    environment.unixODBCDrivers = mkOption {
      type = types.listOf types.package;
      default = [];
-      example = literalExample "with pkgs.unixODBCDrivers; [ mysql psql psqlng ]";
+      example = literalExample "with pkgs.unixODBCDrivers; [ sqlite psql ]";
      description = ''
        Specifies Unix ODBC drivers to be registered in
        <filename>/etc/odbcinst.ini</filename>.  You may also want to
@ -25,11 +32,7 @@ with lib;
  ###### implementation

  config = mkIf (config.environment.unixODBCDrivers != []) {
-
-    environment.etc."odbcinst.ini".text =
-      let inis = map (x : x.ini) config.environment.unixODBCDrivers;
-      in lib.concatStringsSep "\n" inis;
-
+    environment.etc."odbcinst.ini".text = concatMapStringsSep "\n" iniDescription config.environment.unixODBCDrivers;
  };

 }
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -265,6 +265,7 @@
      factorio = 241;
      emby = 242;
      graylog = 243;
+      sniproxy = 244;

      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@ -500,6 +501,7 @@
      taskd = 240;
      factorio = 241;
      emby = 242;
+      sniproxy = 244;

      # When adding a gid, make sure it doesn't match an existing
      # uid. Users and groups with the same name should have equal
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -379,6 +379,7 @@
  ./services/networking/skydns.nix
  ./services/networking/shairport-sync.nix
  ./services/networking/shout.nix
+  ./services/networking/sniproxy.nix
  ./services/networking/softether.nix
  ./services/networking/spiped.nix
  ./services/networking/sslh.nix
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@ -126,6 +126,19 @@ in
          '';
        };

+        denyChrootCaps = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether to lower capabilities of all processes within a chroot,
+            preventing commands that require <literal>CAP_SYS_ADMIN</literal>.
+
+            This protection is disabled by default because it breaks
+            <literal>nixos-rebuild</literal>. Whenever possible, it is
+            highly recommended to enable this protection.
+          '';
+        };
+
        denyUSB = mkOption {
          type = types.bool;
          default = false;
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@ -6,7 +6,6 @@ let
  dnscrypt-proxy = pkgs.dnscrypt-proxy;
  cfg = config.services.dnscrypt-proxy;

-  resolverListFile = "${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv";
  localAddress = "${cfg.localAddress}:${toString cfg.localPort}";

  daemonArgs =
@ -23,7 +22,7 @@ let
        "--provider-key=${cfg.customResolver.key}"
      ]
    else
-      [ "--resolvers-list=${resolverListFile}"
+      [ "--resolvers-list=${cfg.resolverList}"
        "--resolver-name=${toString cfg.resolverName}"
      ];
 in
@ -77,12 +76,24 @@ in
        default = "dnscrypt.eu-nl";
        type = types.nullOr types.string;
        description = ''
-          The name of the upstream DNSCrypt resolver to use. See
-          <filename>${resolverListFile}</filename> for alternative resolvers.
+          The name of the upstream DNSCrypt resolver to use, taken from the
+          list named in the <literal>resolverList</literal> option.
          The default resolver is located in Holland, supports DNS security
          extensions, and claims to not keep logs.
        '';
      };
+      resolverList = mkOption {
+        description = ''
+          The list of upstream DNSCrypt resolvers. By default, we use the most
+          recent list published by upstream.
+        '';
+        example = literalExample "${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv";
+        default = pkgs.fetchurl {
+          url = "https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv";
+          sha256 = "07kbbisrvrqdxif3061hxj3whin3llg4nh50ln7prisi2vbd76xd";
+        };
+        defaultText = "pkgs.fetchurl { url = ...; sha256 = ...; }";
+      };
      customResolver = mkOption {
        default = null;
        description = ''
@ -169,7 +180,7 @@ in
        ${pkgs.lz4}/lib/liblz4.so.* mr,
        ${pkgs.attr.out}/lib/libattr.so.* mr,

-        ${resolverListFile} r,
+        ${cfg.resolverList} r,
      }
    ''));

--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@ -12,6 +12,9 @@ let

  dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}";

+  externalInterfaceFilter = param:
+    optionalString (cfg.externalInterface != null) "${param} ${cfg.externalInterface}";
+
  flushNat = ''
    iptables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true
    iptables -w -t nat -F nixos-nat-pre 2>/dev/null || true
@ -36,19 +39,20 @@ let
    # NAT the marked packets.
    ${optionalString (cfg.internalInterfaces != []) ''
      iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \
-        -o ${cfg.externalInterface} ${dest}
+        ${externalInterfaceFilter "-o"} ${dest}
    ''}

    # NAT packets coming from the internal IPs.
    ${concatMapStrings (range: ''
      iptables -w -t nat -A nixos-nat-post \
-        -s '${range}' -o ${cfg.externalInterface} ${dest}
+        -s '${range}' \! -d '${range}'
+        ${externalInterfaceFilter "-o"} ${dest}
    '') cfg.internalIPs}

    # NAT from external ports to internal ports.
    ${concatMapStrings (fwd: ''
      iptables -w -t nat -A nixos-nat-pre \
-        -i ${cfg.externalInterface} -p tcp \
+        ${externalInterfaceFilter "-i"} -p tcp \
        --dport ${builtins.toString fwd.sourcePort} \
        -j DNAT --to-destination ${fwd.destination}
    '') cfg.forwardPorts}
@ -100,7 +104,8 @@ in
    };

    networking.nat.externalInterface = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
+      default = null;
      example = "eth1";
      description =
        ''
--- a/nixos/modules/services/networking/sniproxy.nix
+++ b/nixos/modules/services/networking/sniproxy.nix
@ -0,0 +1,99 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.sniproxy;
+
+  configFile = pkgs.writeText "sniproxy.conf" ''
+    user ${cfg.user}
+    pidfile /run/sniproxy.pid
+    ${cfg.config}
+  '';
+
+in
+{
+  options = {
+    services.sniproxy = {
+      enable = mkEnableOption "sniproxy server";
+
+      user = mkOption {
+        type = types.str;
+        default = "sniproxy";
+        description = "User account under which sniproxy runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "sniproxy";
+        description = "Group under which sniproxy runs.";
+      };
+
+      config = mkOption {
+        type = types.lines;
+        default = "";
+        description = "sniproxy.conf configuration excluding the daemon username and pid file.";
+        example = literalExample ''
+          error_log {
+            filename /var/log/sniproxy/error.log
+          }
+          access_log {
+            filename /var/log/sniproxy/access.log
+          }
+          listen 443 {
+            proto tls
+          }
+          table {
+            example.com 192.0.2.10
+            example.net 192.0.2.20
+        }
+        '';
+      };
+
+      logDir = mkOption {
+        type = types.str;
+        default = "/var/log/sniproxy/";
+        description = "Location of the log directory for sniproxy.";
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.sniproxy = {
+      description = "sniproxy server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d ${cfg.logDir} || {
+          echo "Creating initial log directory for sniproxy in ${cfg.logDir}"
+          mkdir -p ${cfg.logDir}
+          chmod 640 ${cfg.logDir}
+          }
+        chown -R ${cfg.user}:${cfg.group} ${cfg.logDir}
+      '';
+
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.sniproxy}/bin/sniproxy -c ${configFile}";
+        Restart = "always";
+      };
+    };
+
+    users.extraUsers = mkIf (cfg.user == "sniproxy") {
+      sniproxy = {
+        group = cfg.group;
+        uid = config.ids.uids.sniproxy;
+      };
+    };
+
+    users.extraGroups = mkIf (cfg.group == "sniproxy") {
+      sniproxy = {
+        gid = config.ids.gids.sniproxy;
+      };
+    };
+
+  };
+}
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@ -73,6 +73,7 @@ in {
          ${concatMapStrings (x: " -"+x) cfg.extraOptions} \
          -not ${concatStringsSep " " cfg.excluded} \
      '';
+      serviceConfig.RestartSec = 3;
      serviceConfig.Restart = "always";
    };
  };
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@ -1,26 +1,36 @@
-{ stdenv, fetchgit, alsaLib, fftw }:
+{ stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw,
+  libpulseaudio, ncurses }:

 stdenv.mkDerivation rec {
  name = "cava-${version}";
-  version = "27dbdf47daae44c780db9998c760007b3bf63738";
+  version = "0.4.1";

-  buildInputs = [ alsaLib fftw ];
+  buildInputs = [
+    alsaLib
+    fftw
+    libpulseaudio
+    ncurses
+  ];

-  src = fetchgit {
-    url = "https://github.com/karlstav/cava";
+  src = fetchFromGitHub {
+    owner = "karlstav";
+    repo = "cava";
    rev = version;
-    sha256 = "1a61e2c869376276cf78e6446cd1cc7f96b3e378fa8bc0bc4c5ca81945429909";
+    sha256 = "157hw4cn3qjic7ymn5vy67paxmzssc33h1zswx72ss7j6nc8707f";
  };

-  installPhase = ''
-    mkdir -p $out/bin
-    cp cava $out/bin
+  nativeBuildInputs = [ autoreconfHook ];
+
+  postConfigure = ''
+    substituteInPlace Makefile \
+      --replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" ""
  '';

  meta = with stdenv.lib; {
    description = "Console-based Audio Visualizer for Alsa";
    homepage = https://github.com/karlstav/cava;
-    maintainers = with maintainers; [offline];
+    license = licenses.mit;
+    maintainers = with maintainers; [ offline mirrexagon ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
+, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
+}:
+
+stdenv.mkDerivation rec {
+  name = "flacon-${version}";
+  version = "2.0.1";
+  src = fetchFromGitHub {
+    owner = "flacon";
+    repo = "flacon";
+    rev = "v${version}";
+    sha256 = "0hip411k3arb96rnd22ifs9shlv0xmy96hhx1jcwdk48kw8aa9rw";
+  };
+
+  buildInputs = [ cmake qt5.qtbase qt5.qttools libuchardet pkgconfig makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/flacon \
+      --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
+      mp3gain lame wavpack vorbisgain ]}"
+  '';
+
+  meta = {
+    description = "Extracts audio tracks from an audio CD image to separate tracks.";
+    homepage = https://flacon.github.io/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@ -1,17 +1,23 @@
-{ stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }:
+{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:

 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.4.2";
  name = "qjackctl-${version}";

  # some dependencies such as killall have to be installed additionally

  src = fetchurl {
    url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0nj8c8vy00524hbjqwsqkliblcf9j7h46adk6v5np645pp2iqrav";
+    sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g";
  };

-  buildInputs = [ qt4 alsaLib libjack2 dbus ];
+  buildInputs = [ 
+    qt5.full
+    qt5.qtx11extras
+    alsaLib 
+    libjack2
+    dbus 
+  ];

  configureFlags = "--enable-jack-version";

--- a/pkgs/applications/editors/emacs-modes/dash/default.nix
+++ b/pkgs/applications/editors/emacs-modes/dash/default.nix
@ -1,24 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-let
-  version = "2.12.1";
-in
-stdenv.mkDerivation {
-  name = "emacs-dash-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
-    sha256 = "082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -81,10 +81,10 @@
    aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
    elpaBuild {
        pname = "aggressive-indent";
-        version = "1.6";
+        version = "1.7";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aggressive-indent-1.6.el";
-          sha256 = "1xnxc2x1hbhkbqhp9p3c9azrdm6mr6czqc9pl63phjp9dbslny7i";
+          url = "https://elpa.gnu.org/packages/aggressive-indent-1.7.el";
+          sha256 = "0z2zsw0qnzcabsz2frfsjhfg7qa4nbmprrd41yjfxq62d12wg70m";
        };
        packageRequires = [ cl-lib emacs ];
        meta = {
@ -135,10 +135,10 @@
    arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
    elpaBuild {
        pname = "arbitools";
-        version = "0.70";
+        version = "0.71";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/arbitools-0.70.el";
-          sha256 = "129ykqhx26adw0x26wzb4biyr5pnjgqmycsabsag2hzxjd7c92gl";
+          url = "https://elpa.gnu.org/packages/arbitools-0.71.el";
+          sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50";
        };
        packageRequires = [ cl-lib ];
        meta = {
@ -228,10 +228,10 @@
      }) {};
    beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
        pname = "beacon";
-        version = "1.2.1";
+        version = "1.3.0";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/beacon-1.2.1.el";
-          sha256 = "00i0p7azkkk4jpz6dnbkc4rhcvm1q7dg953874ph50fjihwqi1m6";
+          url = "https://elpa.gnu.org/packages/beacon-1.3.0.el";
+          sha256 = "00hab8w01p43iscpr0hh1s2w80ara2y8d5ccz37i2nl54gj8lpw3";
        };
        packageRequires = [ seq ];
        meta = {
@ -242,10 +242,10 @@
    bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
    elpaBuild {
        pname = "bug-hunter";
-        version = "1.3";
+        version = "1.3.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bug-hunter-1.3.el";
-          sha256 = "1j1d9nml2wl3yj7llykq5k1a81kzb3r4rbn695c0853fk036gk5x";
+          url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el";
+          sha256 = "0xplsnmj144r90vxxkmpdxlaq6gyx4ca6iklq60wd0w05fw9q02x";
        };
        packageRequires = [ cl-lib seq ];
        meta = {
@ -442,15 +442,15 @@
          license = lib.licenses.free;
        };
      }) {};
-    debbugs = callPackage ({ elpaBuild, fetchurl, lib, soap-client }:
+    debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
    elpaBuild {
        pname = "debbugs";
-        version = "0.9.3";
+        version = "0.9.5";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.9.3.tar";
-          sha256 = "0qj1b5ax80bi5kz6jfi4f5kpirkkc2li8zf18fj86q5ayh3rsgnz";
+          url = "https://elpa.gnu.org/packages/debbugs-0.9.5.tar";
+          sha256 = "1m23rghdykx1fvji6in0xp0bxhjcf7ynm14nl4fhiki2nhhwczxh";
        };
-        packageRequires = [ soap-client ];
+        packageRequires = [ cl-lib soap-client ];
        meta = {
          homepage = "https://elpa.gnu.org/packages/debbugs.html";
          license = lib.licenses.free;
@ -1257,10 +1257,10 @@
      }) {};
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20160425";
+        version = "20160502";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20160425.tar";
-          sha256 = "1slrmy8kpapp36lwk9md7rakl1fw8gi377rfff0ma8n7k5xy7b2a";
+          url = "https://elpa.gnu.org/packages/org-20160502.tar";
+          sha256 = "0li067na4p0k9r4nr6a2vfqygvlmzsdgm5kgg2p60lsvydh43fvw";
        };
        packageRequires = [];
        meta = {
@ -1757,6 +1757,20 @@
          license = lib.licenses.free;
        };
      }) {};
+    validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "validate";
+        version = "0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/validate-0.3.el";
+          sha256 = "0nq917217ax5zykzaybv7diz1vgl3y6r8vi7hmz3lzm5dl90jy3m";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/validate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "vlf";
        version = "1.7";
--- a/pkgs/applications/editors/emacs-modes/flycheck/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }:
-
-stdenv.mkDerivation rec {
-  name = "flycheck-0.22-64-g90dbc2d";
-
-  src = fetchFromGitHub {
-    owner = "flycheck";
-    repo = "flycheck";
-    rev = "90dbc2d";
-    sha256 = "08bg4jps6hjldbcrvqarrwdv4xzirm5pns5s0331wm0sc47yvbli";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  buildPhase = ''
-    emacs -L ${let-alist}/share/emacs/site-lisp -L ${dash}/share/emacs/site-lisp --batch -f batch-byte-compile flycheck.el
-    makeinfo --force --no-split -o doc/flycheck.info doc/flycheck.texi
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp $out/share/info
-    mv flycheck.el flycheck.elc $out/share/emacs/site-lisp/
-    mv "doc/"*.info $out/share/info/
-  '';
-
-  meta = {
-    inherit (src.meta) homepage;
-    description = "Modern on-the-fly syntax checking for GNU Emacs";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ simons ];
-  };
-}
--- a/pkgs/applications/editors/emacs-modes/git-modes/default.nix
+++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix
@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs }:
-
-let
-  version = "1.2.0";
-in
-stdenv.mkDerivation {
-  name = "git-modes-${version}";
-
-  src = fetchFromGitHub {
-    owner = "magit";
-    repo = "git-modes";
-    rev = version;
-    sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
-  };
-
-  buildInputs = [ emacs ];
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    mv *.el *.elc $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    homepage = "https://github.com/magit/git-modes";
-    description = "Emacs modes for various Git-related files";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ simons ];
-  };
-}
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@ -1,54 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
-
-let
-  version = "2.3.0";
-in
-stdenv.mkDerivation {
-  name = "magit-${version}";
-
-  src = fetchFromGitHub {
-    owner = "magit";
-    repo = "magit";
-    rev = version;
-    sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8";
-  };
-
-  buildInputs = [ emacs texinfo git ];
-  propagatedUserEnvPkgs = [ gitModes dash ];
-
-  configurePhase = ''
-    makeFlagsArray=(
-      PREFIX="$out"
-      lispdir="$out/share/emacs/site-lisp"
-      DASH_DIR="${dash}/share/emacs/site-lisp"
-      VERSION="${version}"
-    )
-    make ''${makeFlagsArray[@]} -C lisp magit-version.el
-    cp lisp/magit-version.el Documentation/
-    cp lisp/magit-version.el .
-  '';
-
-  doCheck = false;  # 2 out of 15 tests fails, not sure why
-  checkTarget = "test";
-  preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
-
-  meta = {
-    homepage = "https://github.com/magit/magit";
-    description = "Magit, an Emacs interface to Git";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    longDescription = ''
-      With Magit, you can inspect and modify your Git repositories with
-      Emacs. You can review and commit the changes you have made to the
-      tracked files, for example, and you can browse the history of past
-      changes. There is support for cherry picking, reverting, merging,
-      rebasing, and other common Git operations.
-
-      Magit is not a complete interface to Git; it just aims to make the
-      most common Git operations convenient. Thus, Magit will likely not
-      save you from learning Git itself.
-    '';
-
-    maintainers = with stdenv.lib.maintainers; [ simons ];
-  };
-}
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -0,0 +1,28 @@
+{ callPackage }: {
+    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "org";
+        version = "20160502";
+        src = fetchurl {
+          url = "http://orgmode.org/elpa/org-20160502.tar";
+          sha256 = "0ranc2qiw6g6qja0jh1dvh06k6waagkiir2q2zla5d54brw4fg5a";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "org-plus-contrib";
+        version = "20160502";
+        src = fetchurl {
+          url = "http://orgmode.org/elpa/org-plus-contrib-20160502.tar";
+          sha256 = "1znqh4pp9dlqmmdjhgy6vb880hq3cl4q6nmv48x8n5may159mvm0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-plus-contrib.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+  }
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@ -0,0 +1,37 @@
+/*
+
+# Updating
+
+To update the list of packages from ELPA,
+
+1. Clone https://github.com/ttuegel/emacs2nix
+2. Run `./org-packages.sh` from emacs2nix
+3. Copy the new org-packages.json file into Nixpkgs
+4. `git commit -m "org-packages $(date -Idate)"`
+
+*/
+
+{ fetchurl, lib, stdenv, texinfo }:
+
+self:
+
+  let
+
+    imported = import ./org-generated.nix {
+      inherit (self) callPackage;
+    };
+
+    super = imported;
+
+    markBroken = pkg: pkg.override {
+      elpaBuild = args: self.elpaBuild (args // {
+        meta = (args.meta or {}) // { broken = true; };
+      });
+    };
+
+    overrides = {
+    };
+
+    orgPackages = super // overrides;
+
+  in orgPackages // { inherit orgPackages; }
--- a/pkgs/applications/editors/emacs-modes/pcache/default.nix
+++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix
@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "pcache-0.2.3";
-
-  src = fetchgit {
-    url = "https://github.com/sigma/pcache.git";
-    rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
-    sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs --batch -f batch-byte-compile pcache.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install pcache.el pcache.elc $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Persistent caching for Emacs";
-    homepage = https://github.com/sigma/pcache.el;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
--- a/pkgs/applications/editors/emacs-modes/s/default.nix
+++ b/pkgs/applications/editors/emacs-modes/s/default.nix
@ -1,23 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-let version = "1.9.0";
-
-in stdenv.mkDerivation {
-  name = "emacs-s-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
-    sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
-  };
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-  '';
-}
--- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
+++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
@ -1,32 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-stdenv.mkDerivation rec {
-  name = "xml-rpc-1.6.8";
-
-  src = fetchurl {
-    url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
-    sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
-  };
-
-  phases = [ "buildPhase" "installPhase"];
-
-  buildInputs = [ emacs ];
-
-  buildPhase = ''
-    cp $src xml-rpc.el
-    emacs --batch -f batch-byte-compile xml-rpc.el
-  '';
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install xml-rpc.el* $out/share/emacs/site-lisp
-  '';
-
-  meta = {
-    description = "Elisp implementation of clientside XML-RPC";
-    homepage = https://launchpad.net/xml-rpc-el;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:

 callPackage ./generic.nix (args // {
-  version = "2016-05-07";
+  version = "2016-05-09";
  src = fetchgit {
-    sha256 = "5f8974bc56d5eb1d33fbe53b30e80395b690151a1ea418d8aa44c7e092656896";
-    rev = "926bfade544de4a4fd5f1a8082b85a97e2443770";
+    sha256 = "5e3d647503d1231395a6782c6aa536b52b3d45585a87a0600ce0aca8b422cf82";
+    rev = "1e013654cc3af09f4731ab9ec8d8324d03a7de4a";
    url = "git://alioth.debian.org/git/sane/sane-backends.git";
  };
 })
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, clang, gcc }:
+
+stdenv.mkDerivation rec {
+  name = "milu-nightly-${version}";
+  version = "2016-05-09";
+
+  src = fetchFromGitHub {
+    sha256 = "14cglw04cliwlpvw7qrs6rfm5sv6qa558d7iby5ng3wdjcwx43nk";
+    rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1";
+    repo = "Milu";
+    owner = "yuejia";
+  };
+
+  preConfigure = ''
+    sed -i 's#/usr/bin/##g' Makefile
+    sed -i "s#-lclang#-L$(clang --print-search-dirs |
+            sed -ne '/libraries:/{s/libraries: =//; s/:/ -L/gp}') -lclang#g" Makefile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/milu $out/bin
+  '';
+
+  buildInputs = [
+     pkgconfig
+     glib
+     unzip
+     clang
+     gcc
+  ];
+
+  meta = {
+    description = "Higher Order Mutation Testing Tool for C and C++ programs";
+    homepage = http://github.com/yuejia/Milu;
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.vrthra ];
+  };
+}
+
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "vue-${version}";
  version = "3.3.0";
  src = fetchurl {
-    url = "releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
+    url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
    sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx";
  };

--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@ -24,7 +24,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
  src = fetchurl {
    url =
      let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
-      in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
+      in "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
    inherit sha512;
  };

@ -131,14 +131,14 @@ in {

  firefox-unwrapped = common {
    pname = "firefox";
-    version = "46.0";
-    sha512 = "f5a652e25fa74e3cb271af04d50cc7b63ca73fde9d2ff350e84b3dda55352bac2b28b567aed12164285d992414ad475da9d2555ab972e5c5d7b8f5226591036b";
+    version = "46.0.1";
+    sha512 = "c58642774f93ceaef4f99bc3fe578db6e4f6de7f1d23080da97b61bc4fc6b516ce99fa04368893c0fa2cb9cd0b36e96955656daa97d0bd0d8f4da6a2d364cb98";
  };

  firefox-esr-unwrapped = common {
    pname = "firefox-esr";
-    version = "45.0.2esr";
-    sha512 = "a1e9e9371ee47181b01252d60166c405a7835063dffb4928dfb8abb9f151edd8db1dd2b59f35d7898f1660a0fcd8e41f91a3e799c25b6dd43b6ab056bc5ad6bf";
+    version = "45.1.1esr";
+    sha512 = "ee6bccdf01450c5b371e31c35f5bb084ad49f796fcc9cf3a346646972044ad85ce198cc34b697c32e2d3ad1e25955ef5b91b68790704ecaa4de9d3a412914fc7";
  };

 }
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@ -17,11 +17,11 @@ in
 stdenv.mkDerivation rec {
  name = "bluejeans-${version}";

-  version = "2.125.24.5";
+  version = "2.155.17.5";

  src = fetchurl {
    url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "0lxxd7icfqcpg5rb4njkk4ybxmisv4c509yisznxspi49qfxirwq";
+    sha256 = "1vszk0nrnpji4lm2pndq11kfcrcq1xccjbif9nkm15s3hcb1b66m";
  };

  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@ -32,6 +32,7 @@ let
      xorg.libXfixes
      xorg.libXrender
      xorg.libXrandr
+      xorg.libXext
      stdenv.cc.cc
      alsaLib
      libpulseaudio
@ -50,18 +51,18 @@ stdenv.mkDerivation rec {
  # You can get the upstream version and SHA-1 hash from the following URLs:
  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1'
-  version = "5.4.2.0";
+  version = "5.41.0.0";

  src =
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha1 = "d75fad757750b4830c4e401ade92b4993e2a4ab2";
+        sha1 = "1c3cc0411444587b56178de4868eb5d0ff742ec0";
      }
    else if stdenv.system == "i686-linux" then
      fetchurl {
        url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha1 = "410872377b0bdac06b580c5e1755a3a3c712144b";
+        sha1 = "0d31d726c5e9a49917e2749e73386b1c0fdcb376";
      }
    else throw "Google Talk does not support your platform.";

--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <string.h>
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf
+{ stdenv, fetchurl, makeDesktopItem, patchelf
 , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
 , libX11, libXmu, ncurses, popt, qt5, zlib
-, qtbase, qtdeclarative, qtwebkit
+, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
 }:

 # this package contains the daemon version of dropbox
@ -62,7 +62,7 @@ in stdenv.mkDerivation {

  sourceRoot = ".dropbox-dist";

-  buildInputs = [ makeWrapper patchelf ];
+  nativeBuildInputs = [ makeQtWrapper patchelf ];
  dontPatchELF = true; # patchelf invoked explicitly below
  dontStrip = true; # already done

@ -102,7 +102,7 @@ in stdenv.mkDerivation {

    mkdir -p "$out/bin"
    RPATH="${ldpath}:$out/${appdir}"
-    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+    makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
      --prefix LD_LIBRARY_PATH : "$RPATH"
  '';

--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@ -1,25 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, gettext
+{ stdenv, fetchurl, pkgconfig, gtk, lua, perl, python
 , libtool, pciutils, dbus_glib, libcanberra, libproxy
 , libsexy, enchant, libnotify, openssl, intltool
 , desktop_file_utils, hicolor_icon_theme
 }:

 stdenv.mkDerivation rec {
-  version = "2.10.2";
+  version = "2.12.1";
  name = "hexchat-${version}";

  src = fetchurl {
    url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
-    sha256 = "0b5mw6jxa7c93nbgiwijm7j7klm6nccx6l9zyainyrbnqmjz7sw7";
+    sha256 = "0svwz9ldrry1sn35jywgpacjj1cf3xl3k74ynwn8rjvxs73b00aj";
  };

-  buildInputs = [
-    pkgconfig gtk perl python gettext
-    libtool pciutils dbus_glib libcanberra libproxy
-    libsexy libnotify openssl intltool
-    desktop_file_utils hicolor_icon_theme
+  nativeBuildInputs = [
+    pkgconfig libtool intltool
  ];

+  buildInputs = [
+    gtk lua perl python pciutils dbus_glib libcanberra libproxy
+    libsexy libnotify openssl desktop_file_utils hicolor_icon_theme
+  ];
+
+  enableParallelBuilding = true;
+
 #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
  patchPhase = ''
    sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
  name = "thunderbird-${verName}";

  src = fetchurl {
-    url = "http://archive.mozilla.org/pub/thunderbird/releases/"
-      + "${verName}/source/thunderbird-${verName}.source.tar.xz";
+    url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
    sha256 = "0rynfyxgpvfla17zniaq84slc02kg848qawkjmdbnv74y6bkhs8m";
  };

--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
+
+stdenv.mkDerivation rec {
+  name = "sniproxy-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "dlundquist";
+    repo = "sniproxy";
+    rev = version;
+    sha256 = "1r6hv55k2z8l5q57l2q2x3nsspc2yjvi56l760yrz2c1hgh6r0a2";
+  };
+
+  buildInputs = [ autoconf automake autoreconfHook gettext libev pcre pkgconfig udns ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Transparent TLS and HTTP layer 4 proxy with SNI support";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok
-, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi
+, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi, glibmm
 }:

 stdenv.mkDerivation rec {
-  name = "pulseview-0.2.0";
+  name = "pulseview-0.3.0";

  src = fetchurl {
    url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
-    sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
+    sha256 = "03jk5xpsird5ssbnwkxw57jnqvnnpivhqh1xjdhdrz02lsvjrzjz";
  };

  buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
-    libsigrokdecode libserialport libzip udev libusb1 libftdi
+    libsigrokdecode libserialport libzip udev libusb1 libftdi glibmm
  ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@ -13,7 +13,7 @@ let
    baseName="leo2";
    version = "1.6.2";
    name="${baseName}_v${version}";
-    url="page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
+    url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
    hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d35303e0e9e3a";
  };
 in
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "0.2pre4";
+
+in
+
+stdenv.mkDerivation {
+  name = "tivodecode-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
+    sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
+  };
+
+  meta = {
+    description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
+    homepage = http://tivodecode.sourceforge.net;
+  };
+}
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@ -6,8 +6,8 @@ let
  version = "0.9.9";
  contrib = (fetchgit {
    url = "https://github.com/stumpwm/stumpwm-contrib.git";
-    rev = "e139885fffcedaeba4b263e4575daae4364cad52";
-    sha256 = "fe75bb27538a56f2d213fb21e06a8983699e129a10da7014ddcf6eed5cd965f8";
+    rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f";
+    sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
  });
 in
 stdenv.mkDerivation rec {
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -345,4 +345,11 @@ rec {
  pypi = [
    https://pypi.io/packages/source/
  ];
+
+  # Mozilla projects.
+  mozilla = [
+    http://download.cdn.mozilla.net/pub/mozilla.org/
+    https://archive.mozilla.org/pub/
+  ];
+
 }
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@ -8,6 +8,7 @@ let
    config = {
      mode = "auto";
      sysctl = false;
+      denyChrootCaps = false;
      denyChrootChmod = false;
      denyUSB = false;
      restrictProc = false;
@ -112,6 +113,7 @@ let
        }

        GRKERNSEC_SYSCTL ${boolToKernOpt cfg.config.sysctl}
+        GRKERNSEC_CHROOT_CAPS ${boolToKernOpt cfg.config.denyChrootCaps}
        GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod}
        GRKERNSEC_DENYUSB ${boolToKernOpt cfg.config.denyUSB}
        GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC}
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -572,10 +572,11 @@ rec {
     strongly connected components.  See deb/deb-closure.nix. */

  fillDiskWithDebs =
-    { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }:
+    { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS
+    , QEMU_OPTS ? "", memSize ? 512 }:

    runInLinuxVM (stdenv.mkDerivation {
-      inherit name postInstall;
+      inherit name postInstall QEMU_OPTS memSize;

      debs = (lib.intersperse "|" debs);

@ -734,7 +735,8 @@ rec {
  makeImageFromDebDist =
    { name, fullName, size ? 4096, urlPrefix
    , packagesList ? "", packagesLists ? [packagesList]
-    , packages, extraPackages ? [], postInstall ? "" }:
+    , packages, extraPackages ? [], postInstall ? ""
+    , QEMU_OPTS ? "", memSize ? 512 }:

    let
      expr = debClosureGenerator {
@ -743,7 +745,7 @@ rec {
      };
    in
      (fillDiskWithDebs {
-        inherit name fullName size postInstall;
+        inherit name fullName size postInstall QEMU_OPTS memSize;
        debs = import expr {inherit fetchurl;};
      }) // {inherit expr;};

--- a/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/pkgs/data/fonts/tempora-lgc/default.nix
@ -2,19 +2,19 @@
 let
  srcs = [
    (fetchurl {
-      url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf";
+      url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf;
      sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq";
    })
    (fetchurl {
-      url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf";
+      url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf;
      sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp";
    })
    (fetchurl {
-      url = "www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf";
+      url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf;
      sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04";
    })
    (fetchurl {
-      url = "www.ttfotf.com/download-font/tempora-lgc-unicode.otf";
+      url = http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf;
      sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i";
    })
  ];
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "xits-math-${version}";
+  version = "1.108";
+
+  src = fetchFromGitHub {
+    owner = "khaledhosny";
+    repo = "xits-math";
+    rev = "v${version}";
+    sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp *.otf $out/share/fonts/opentype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/khaledhosny/xits-math;
+    description = "OpenType implementation of STIX fonts with math support";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
  name = "geolite-legacy-${version}";
-  version = "2016-05-03";
+  version = "2016-05-09";

  srcGeoIP = fetchDB
    "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
    "1v8wdqh6yjicb7bdcxp7v5dimlrny1fiynf4wr6wh65vr738csy2";
  srcGeoIPASNum = fetchDB
    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "04gyrb5qyy3i1p9lgnls90irq3s64y5qfcqj91nx4x68r7dixnai";
+    "0a8m521r1b4q88d7zffnkgvn9hjxcr7jzwd9qmnzjxfl5r7iiwzr";
  srcGeoIPASNumv6 = fetchDB
    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1l9j97bk3mbv5b6lxva6ig590gl7097xr0vayz5mpsfx5d37r4zw";
+    "079a88ybfbbhqslm2hf72lpl2rjr6s6nz3cahay6m8ahaga9y75s";

  meta = with stdenv.lib; {
    description = "GeoLite Legacy IP geolocation databases";
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl }:

 let
-  version = "20120614";
+  version = "20151214";
  pname = "mobile-broadband-provider-info";
  name = "${pname}-${version}";
 in
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
-    sha256 = "72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1";
+    sha256 = "1905nab1h8p4hx0m1w0rn4mkg9209x680dcr4l77bngy21pmvr4a";
  };

  meta = {
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@ -1,25 +1,18 @@
 { stdenv, fetchurl }:

-stdenv.mkDerivation {
-  name = "dev86-0.16.19";
+stdenv.mkDerivation rec {
+  name = "dev86-${version}";
+  version = "0.16.21";

  src = fetchurl {
-    url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz;
-    sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e";
+    url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz";
+    sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3";
  };

  makeFlags = "PREFIX=$(out)";

-  # Awful hackery to get dev86 to compile with recent gcc/binutils.
-  # See http://bugs.gentoo.org/214964 for some inconclusive
-  # discussion.
-  preBuild =
-    ''
-      substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
-    '';
-
  meta = {
    description = "Linux 8086 development environment";
-    homepage = http://www.debath.co.uk/;
+    homepage = http://v3.sk/~lkundrak/dev86/;
  };
 }
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@ -7,11 +7,11 @@
 }:
 mkDerivation {
  pname = "elm-compiler";
-  version = "0.16";
+  version = "0.17";
  src = fetchgit {
    url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "b3bcdca469716f3a4195469549a9e9bc53a6030aff132ec620b9c93958a5ffe6";
-    rev = "df86c1c9b3cf06de3ccb78f26b4d2fac0129ce5a";
+    sha256 = "185mh53yyxh9m0z8808fxpds3vqyrbhahf587nnw6qzyzv63m7px";
+    rev = "c9c7e72c424a13255f8ee84c719f7ef48b689c1a";
  };
  isLibrary = true;
  isExecutable = true;
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@ -1,22 +1,22 @@
 { mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
 , blaze-html, blaze-markup, bytestring, containers, directory
 , elm-compiler, elm-package, fetchgit, filepath, mtl
-, optparse-applicative, stdenv, text, time
+, optparse-applicative, stdenv, text, time, raw-strings-qq
 }:
 mkDerivation {
  pname = "elm-make";
-  version = "0.16";
+  version = "0.17";
  src = fetchgit {
    url = "https://github.com/elm-lang/elm-make";
-    sha256 = "fc0a6ed08b236dfab43e9af73f8e83a3b88a155695a9671a2b291dc596a75116";
-    rev = "54e0b33fea0cd72400ac6a3dec7643bf1b900741";
+    sha256 = "0y8a67y8jhnhbcqzgjymyf1ffs75vyfpyb8as2bi0mkhb7fvzi6q";
+    rev = "5f7b74567c43eff341048c7caceb247b51cdb8bb";
  };
  isLibrary = false;
  isExecutable = true;
  executableHaskellDepends = [
    aeson ansi-terminal ansi-wl-pprint base binary blaze-html
    blaze-markup bytestring containers directory elm-compiler
-    elm-package filepath mtl optparse-applicative text time
+    elm-package filepath mtl optparse-applicative text time raw-strings-qq
  ];
  jailbreak = true;
  homepage = "http://elm-lang.org";
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@ -6,11 +6,11 @@
 }:
 mkDerivation {
  pname = "elm-package";
-  version = "0.16";
+  version = "0.17";
  src = fetchgit {
    url = "https://github.com/elm-lang/elm-package";
-    sha256 = "836789a823ab1d97a37907396856d8808c5573e295315c0a55e5bb44915fba4b";
-    rev = "6305a7954a45d1635d6a7185f2dcf136c376074f";
+    sha256 = "1x9jczby38ax3rbjq6hbyr593dhxazm39gy9jv00k6508dzvfg2l";
+    rev = "fc0924210fe5a7c0af543769b1353dbb2ddf2f0c";
  };
  isLibrary = true;
  isExecutable = true;
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@ -1,18 +1,22 @@
 {
-  "evancz/virtual-dom" = {
-    version = "2.1.0";
-    sha256 = "0x072vk2x9md5pxwc3f3v7gm738wr996d54avzzadfvj3qcjxpfs";
+  "elm-lang/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0pa8k04g9yfixahsb30j0rbhfh6hwdh7xmm2fvk0hkidw7b4xg57";
  };
  "evancz/elm-markdown" = {
-    version = "2.0.0";
-    sha256 = "1x1kvwag7idxif4gsznnx0lp1c49dl9pin3aj0dq21lzradggn3g";
+    version = "3.0.0";
+    sha256 = "1wlr8sgnyq6qgh5rcjy7imfmpqxrxgmmqcfx6p541fs70yiqya12";
  };
-  "evancz/elm-html" = {
-    version = "4.0.2";
-    sha256 = "05hzsnsqp2krd9s4xjwhmvyafpky4dc40bbk9sgsr301450cfgw6";
+  "elm-lang/html" = {
+    version = "1.0.0";
+    sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4";
  };
  "elm-lang/core" = {
-    version = "3.0.0";
-    sha256 = "18pdsnz05pjhdv575l3bqzrjd7780zgpcklg4c6lvwwcanpg42pk";
+    version = "4.0.0";
+    sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw";
+  };
+  "elm-lang/svg" = {
+    version = "1.0.0";
+    sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx";
  };
 }
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@ -1,22 +1,22 @@
 { mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs
 , directory, elm-compiler, fetchgit, filepath, fsnotify, mtl
 , snap-core, snap-server, stdenv, text, time, transformers
-, websockets, websockets-snap
+, websockets, websockets-snap, elm-package, file-embed
 }:
 mkDerivation {
  pname = "elm-reactor";
-  version = "0.16";
+  version = "0.17";
  src = fetchgit {
    url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "55605b8443dad20c78e297ce35a603cb107b0c1e57bf1c4710faaebc60396de0";
-    rev = "b03166296d11e240fa04cdb748e1f3c4af7afc83";
+    sha256 = "14hb16qwx1f4bfngh87pwjavgz6njbwdxlsy218rw3xydy3s1cn3";
+    rev = "4781ad2fbb6cbcde0d659dec293bbed9c847ba71";
  };
  isLibrary = false;
  isExecutable = true;
  executableHaskellDepends = [
    base blaze-html blaze-markup bytestring cmdargs directory
    elm-compiler filepath fsnotify mtl snap-core snap-server text time
-    transformers websockets websockets-snap
+    transformers websockets websockets-snap elm-package file-embed
  ];
  jailbreak = true;
  homepage = "http://elm-lang.org";
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@ -5,11 +5,11 @@
 }:
 mkDerivation {
  pname = "elm-repl";
-  version = "0.16";
+  version = "0.17";
  src = fetchgit {
    url = "https://github.com/elm-lang/elm-repl";
-    sha256 = "36d50cf1f86815900afd4b75da6e5cd15008b2652e97ffed0f321a28e6442874";
-    rev = "265de7283488964f44f0257a8b4a055ad8af984d";
+    sha256 = "1mxg99w36b8i43kl1nxp7fd86igi5wyj08m9mraiq58vpcgyqnzq";
+    rev = "95b4555cff6b6e2a55a4ea3dab00bfb39dfebf0d";
  };
  isLibrary = false;
  isExecutable = true;
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ b/pkgs/development/compilers/elm/packages/release.nix
@ -1,6 +1,6 @@
 { callPackage }:
 {
-  version = "0.16.0";
+  version = "0.17.0";
  packages = {
    elm-compiler = callPackage ./elm-compiler.nix { };
    elm-package = callPackage ./elm-package.nix { };
--- a/pkgs/development/compilers/julia/0003-no-ldconfig.patch
+++ b/pkgs/development/compilers/julia/0003-no-ldconfig.patch
@ -21,9 +21,9 @@ index 22015ff..2821192 100644
 -    FILE *ldc = popen("/sbin/ldconfig -r", "r");
 -#endif
 +    FILE *ldc = popen("true", "r");
+     if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr)
 
     while (!feof(ldc)) {
-         ssize_t n = getline(&line, &sz, ldc);
 -- 
 2.5.2

--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@ -33,10 +33,10 @@ let
    sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
  };

-  libuvVersion = "9ab431a88fe255dd21e19a11f7fa2dd95774abf4";
+  libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e";
  libuv = fetchurl {
    url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "1bh973lbrzrjk7pcjbjnh4n92qldi81ql3aqsclywn2yg07a36h5";
+    sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7";
  };

  rmathVersion = "0.1";
@ -48,12 +48,12 @@ in

 stdenv.mkDerivation rec {
  pname = "julia";
-  version = "0.4.2";
+  version = "0.4.5";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "04i5kjji5553lkdxz3wgflg1mav5ivwy2dascjy8jprqpq33aknk";
+    sha256 = "09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4";
  };

  prePatch = ''
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  name    = "sbcl-${version}";
-  version = "1.3.4";
+  version = "1.3.5";

  src = fetchurl {
    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0zx6z43xfnw1b6v5d3bpjrwgqs14wxlji22nl0lr4wmzbfbzvqli";
+    sha256 = "0p3f9bvwdcl84n1l6imww547bdbfsbkvad8iad43jcb2hrpy3wf8";
  };

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

  # Byte-compile elisp code for Emacs.
  hindent = overrideCabal super.hindent (drv: {
-    # https://github.com/chrisdone/hindent/issues/166
-    doCheck = false;
    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
    postInstall = ''
      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
@ -941,9 +939,6 @@ self: super: {
  # Looks like Avahi provides the missing library
  dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };

-  # https://github.com/danidiaz/pipes-transduce/issues/2
-  pipes-transduce = super.pipes-transduce.override { foldl = self.foldl_1_1_6; };
-
  # Haste stuff
  haste-Cabal         = self.callPackage ../tools/haskell/haste/haste-Cabal.nix {};
  haste-cabal-install = self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; HTTP = self.HTTP_4000_2_23; };
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@ -33,33 +33,17 @@ self: super: {
  unix = null;
  xhtml = null;

-  # ekmett/linear#74
-  linear = overrideCabal super.linear (drv: {
-    prePatch = "sed -i 's/-Werror//g' linear.cabal";
-  });
-
-  # Cabal_1_22_1_1 requires filepath >=1 && <1.4
+  # Our core version of Cabal is good enough for this build.
  cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });

-  # Don't compile jailbreak-cabal with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
-    version = "1.23.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell";
-      repo = "cabal";
-      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
-      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
-    };
-    jailbreak = false;
-    doHaddock = false;
-    postUnpack = "sourceRoot+=/Cabal";
-  });
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_23_0_0;
-    mkDerivation = drv: self.mkDerivation (drv // {
-      preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
-    });
-  };
+  # Enable latest version of cabal-install.
+  cabal-install_1_24_0_0 = (doDistribute (dontJailbreak (dontCheck (super.cabal-install_1_24_0_0)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
+
+  # Jailbreaking is required for the test suite only (which we don't run).
+  Cabal_1_24_0_0 = dontJailbreak (dontCheck super.Cabal_1_24_0_0);
+
+  # Build jailbreak-cabal with the latest version of Cabal.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };

  idris = overrideCabal super.idris (drv: {
    # "idris" binary cannot find Idris library otherwise while building.
@ -206,4 +190,11 @@ self: super: {
  # Trigger rebuild to mitigate broken packaes on Hydra.
  amazonka-core = triggerRebuild super.amazonka-core 1;

+  # https://github.com/thoughtpolice/hs-ed25519/issues/13
+  ed25519 = dontCheck super.ed25519;
+
+  # https://github.com/well-typed/hackage-security/issues/157
+  # https://github.com/well-typed/hackage-security/issues/158
+  hackage-security = dontHaddock (dontCheck super.hackage-security);
+
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@ -149,4 +149,16 @@ self: super: {
  trifecta       = doJailbreak super.trifecta;

  turtle         = doJailbreak super.turtle;
+
+  ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
+    pname = "ghcjs-prim";
+    version = "0.1.0.0";
+    src = fetchgit {
+      url = git://github.com/ghcjs/ghcjs-prim.git;
+      rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
+      sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
+    };
+    buildDepends = [ primitive ];
+    license = pkgs.stdenv.lib.licenses.bsd3;
+  }) {};
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -45,7 +45,6 @@ extra-packages:
  - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
  - haddock-api < 2.16                  # required on GHC 7.8.x
  - haskell-src-exts < 1.16             # required for structured-haskell-mode-1.0.8
-  - hjsonpointer == 0.2.0.4             # required for hjsonschema-0.8.0.1
  - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
  - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
  - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3636,6 +3640,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4592,6 +4597,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4604,6 +4610,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4918,6 +4925,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5254,6 +5262,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5627,6 +5636,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5983,6 +5993,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6970,6 +6981,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7613,6 +7625,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7893,6 +7906,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8212,6 +8226,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8415,6 +8430,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8539,6 +8555,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8592,6 +8609,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8722,6 +8740,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9058,6 +9077,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3636,6 +3640,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4592,6 +4597,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4604,6 +4610,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4918,6 +4925,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5254,6 +5262,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5627,6 +5636,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5983,6 +5993,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6970,6 +6981,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7613,6 +7625,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7893,6 +7906,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8212,6 +8226,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8415,6 +8430,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8539,6 +8555,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8592,6 +8609,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8722,6 +8740,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9058,6 +9077,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3636,6 +3640,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4592,6 +4597,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4604,6 +4610,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4918,6 +4925,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5254,6 +5262,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5627,6 +5636,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5983,6 +5993,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6970,6 +6981,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7613,6 +7625,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7893,6 +7906,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8212,6 +8226,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8415,6 +8430,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8539,6 +8555,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8592,6 +8609,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8722,6 +8740,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9058,6 +9077,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3636,6 +3640,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4592,6 +4597,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4604,6 +4610,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4918,6 +4925,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5254,6 +5262,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5627,6 +5636,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5983,6 +5993,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6970,6 +6981,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7613,6 +7625,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7893,6 +7906,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8212,6 +8226,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8415,6 +8430,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8539,6 +8555,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8592,6 +8609,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8722,6 +8740,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9058,6 +9077,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3635,6 +3639,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4589,6 +4594,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4601,6 +4607,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4915,6 +4922,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5251,6 +5259,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5624,6 +5633,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5980,6 +5990,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6967,6 +6978,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7609,6 +7621,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7889,6 +7902,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8208,6 +8222,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8411,6 +8426,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8535,6 +8551,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8588,6 +8605,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8718,6 +8736,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9054,6 +9073,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1189,6 +1190,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1283,6 +1285,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2458,6 +2461,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3635,6 +3639,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4589,6 +4594,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4601,6 +4607,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4915,6 +4922,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5251,6 +5259,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5624,6 +5633,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5980,6 +5990,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6967,6 +6978,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7609,6 +7621,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7889,6 +7902,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8208,6 +8222,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8411,6 +8426,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8535,6 +8551,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8588,6 +8605,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8718,6 +8736,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9054,6 +9073,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1188,6 +1189,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1282,6 +1284,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2457,6 +2460,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3634,6 +3638,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4587,6 +4592,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4599,6 +4605,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4913,6 +4920,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5249,6 +5257,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5622,6 +5631,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5978,6 +5988,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6965,6 +6976,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7606,6 +7618,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7886,6 +7899,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8205,6 +8219,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8408,6 +8423,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8532,6 +8548,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8585,6 +8602,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8715,6 +8733,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9051,6 +9070,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1188,6 +1189,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1282,6 +1284,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2457,6 +2460,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3634,6 +3638,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4587,6 +4592,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4599,6 +4605,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4913,6 +4920,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5249,6 +5257,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
@ -5622,6 +5631,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5978,6 +5988,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6965,6 +6976,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7606,6 +7618,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7886,6 +7899,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "sodium" = doDistribute super."sodium_0_11_0_2";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
@ -8205,6 +8219,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8408,6 +8423,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8532,6 +8548,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8585,6 +8602,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8715,6 +8733,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9051,6 +9070,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1185,6 +1186,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1279,6 +1281,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2450,6 +2453,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3625,6 +3629,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4579,6 +4584,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_6";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4591,6 +4597,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4904,6 +4911,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5240,6 +5248,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5613,6 +5622,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5969,6 +5979,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6956,6 +6967,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7596,6 +7608,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7876,6 +7889,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8194,6 +8208,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8397,6 +8412,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8521,6 +8537,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8574,6 +8591,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8703,6 +8721,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9039,6 +9058,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1185,6 +1186,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1279,6 +1281,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2448,6 +2451,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3622,6 +3626,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4573,6 +4578,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4585,6 +4591,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4898,6 +4905,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5234,6 +5242,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5607,6 +5616,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5962,6 +5972,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6949,6 +6960,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7589,6 +7601,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7868,6 +7881,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8185,6 +8199,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8386,6 +8401,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8509,6 +8525,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8562,6 +8579,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8691,6 +8709,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9026,6 +9045,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3613,6 +3617,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4562,6 +4567,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4574,6 +4580,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4887,6 +4894,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5218,6 +5226,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5590,6 +5599,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5945,6 +5955,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6929,6 +6940,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7567,6 +7579,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7845,6 +7858,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8162,6 +8176,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8361,6 +8376,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8483,6 +8499,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8535,6 +8552,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8664,6 +8682,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8998,6 +9017,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3612,6 +3616,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4561,6 +4566,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4573,6 +4579,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4886,6 +4893,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5215,6 +5223,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5586,6 +5595,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5941,6 +5951,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6925,6 +6936,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7563,6 +7575,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7841,6 +7854,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8158,6 +8172,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8357,6 +8372,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8479,6 +8495,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8531,6 +8548,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8660,6 +8678,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8994,6 +9013,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3612,6 +3616,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4560,6 +4565,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4572,6 +4578,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4885,6 +4892,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5214,6 +5222,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
  "json-b" = dontDistribute super."json-b";
@ -5585,6 +5594,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5940,6 +5950,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6924,6 +6935,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7562,6 +7574,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7840,6 +7853,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8157,6 +8171,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8356,6 +8371,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8478,6 +8494,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8530,6 +8547,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8659,6 +8677,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8993,6 +9012,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3612,6 +3616,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4559,6 +4564,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4571,6 +4577,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4884,6 +4891,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5213,6 +5221,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
  "json-b" = dontDistribute super."json-b";
@ -5584,6 +5593,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5939,6 +5949,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6923,6 +6934,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7561,6 +7573,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7839,6 +7852,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8156,6 +8170,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8354,6 +8369,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8476,6 +8492,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8528,6 +8545,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8657,6 +8675,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8991,6 +9010,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1183,6 +1184,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1277,6 +1279,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2441,6 +2444,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3609,6 +3613,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4556,6 +4561,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4568,6 +4574,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4881,6 +4888,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5210,6 +5218,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
  "json-b" = dontDistribute super."json-b";
@ -5581,6 +5590,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5936,6 +5946,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6920,6 +6931,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7557,6 +7569,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7835,6 +7848,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8152,6 +8166,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8350,6 +8365,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8472,6 +8488,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8524,6 +8541,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8653,6 +8671,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8987,6 +9006,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1182,6 +1183,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1276,6 +1278,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2439,6 +2442,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3605,6 +3609,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4552,6 +4557,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4564,6 +4570,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4877,6 +4884,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5206,6 +5214,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
  "json-b" = dontDistribute super."json-b";
@ -5577,6 +5586,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5932,6 +5942,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6914,6 +6925,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7550,6 +7562,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7828,6 +7841,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8143,6 +8157,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8341,6 +8356,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8463,6 +8479,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8515,6 +8532,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8644,6 +8662,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8978,6 +8997,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1185,6 +1186,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1279,6 +1281,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2446,6 +2449,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3619,6 +3623,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4570,6 +4575,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4582,6 +4588,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4895,6 +4902,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5231,6 +5239,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5604,6 +5613,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5959,6 +5969,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6945,6 +6956,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7583,6 +7595,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7862,6 +7875,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8179,6 +8193,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8380,6 +8395,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8503,6 +8519,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8556,6 +8573,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8685,6 +8703,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9020,6 +9039,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2445,6 +2448,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3617,6 +3621,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4567,6 +4572,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4579,6 +4585,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4892,6 +4899,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5228,6 +5236,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5601,6 +5610,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5956,6 +5966,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6941,6 +6952,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7579,6 +7591,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7858,6 +7871,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8175,6 +8189,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8375,6 +8390,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8498,6 +8514,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8551,6 +8568,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8680,6 +8698,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9015,6 +9034,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3616,6 +3620,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4566,6 +4571,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4578,6 +4584,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4891,6 +4898,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5227,6 +5235,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5600,6 +5609,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5955,6 +5965,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6940,6 +6951,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7578,6 +7590,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7857,6 +7870,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8174,6 +8188,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8374,6 +8389,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8496,6 +8512,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8549,6 +8566,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8678,6 +8696,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9012,6 +9031,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3616,6 +3620,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4566,6 +4571,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4578,6 +4584,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4891,6 +4898,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5222,6 +5230,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5595,6 +5604,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5950,6 +5960,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_0";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6935,6 +6946,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7573,6 +7585,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7852,6 +7865,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8169,6 +8183,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8369,6 +8384,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8491,6 +8507,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8544,6 +8561,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8673,6 +8691,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9007,6 +9026,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3614,6 +3618,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4563,6 +4568,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4575,6 +4581,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4888,6 +4895,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5219,6 +5227,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5591,6 +5600,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5946,6 +5956,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6931,6 +6942,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7569,6 +7581,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7848,6 +7861,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8165,6 +8179,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8365,6 +8380,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8487,6 +8503,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8539,6 +8556,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8668,6 +8686,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9002,6 +9021,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1184,6 +1185,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1278,6 +1280,7 @@ self: super: {
  "amazonka-codedeploy" = dontDistribute super."amazonka-codedeploy";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = dontDistribute super."amazonka-cognito-identity";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = dontDistribute super."amazonka-cognito-sync";
  "amazonka-config" = dontDistribute super."amazonka-config";
  "amazonka-core" = dontDistribute super."amazonka-core";
@ -2444,6 +2447,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = dontDistribute super."cryptol";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3613,6 +3617,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4562,6 +4567,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_8";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4574,6 +4580,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = dontDistribute super."hpc-coveralls";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4887,6 +4894,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5218,6 +5226,7 @@ self: super: {
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
@ -5590,6 +5599,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5945,6 +5955,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_0_3_3_1";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_8_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = doDistribute super."monad-extras_0_5_9";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6930,6 +6941,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7568,6 +7580,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = dontDistribute super."servant-server";
@ -7847,6 +7860,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8164,6 +8178,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8364,6 +8379,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8486,6 +8502,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8538,6 +8555,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = dontDistribute super."tttool";
  "tubes" = dontDistribute super."tubes";
@ -8667,6 +8685,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -9001,6 +9020,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1176,6 +1177,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1270,6 +1272,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_3";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_3";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_3";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_3";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_3";
@ -2427,6 +2430,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_1";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3591,6 +3595,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4534,6 +4539,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4546,6 +4552,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4859,6 +4866,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5181,6 +5189,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_11";
  "json-b" = dontDistribute super."json-b";
@ -5547,6 +5556,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5900,6 +5910,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6872,6 +6883,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7507,6 +7519,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7781,6 +7794,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8094,6 +8108,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8292,6 +8307,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8414,6 +8430,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8466,6 +8483,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8594,6 +8612,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8926,6 +8945,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1176,6 +1177,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1270,6 +1272,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_3";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_3";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_3";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_3";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_3";
@ -2426,6 +2429,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_1";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3590,6 +3594,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4533,6 +4538,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4545,6 +4551,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4858,6 +4865,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5180,6 +5188,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5546,6 +5555,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5899,6 +5909,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6871,6 +6882,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7506,6 +7518,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7780,6 +7793,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8093,6 +8107,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8291,6 +8306,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8413,6 +8429,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8465,6 +8482,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8593,6 +8611,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8924,6 +8943,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1265,6 +1267,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_4";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_4";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_4";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_4";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_4";
@ -2414,6 +2417,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3573,6 +3577,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4514,6 +4519,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4526,6 +4532,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4837,6 +4844,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5156,6 +5164,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5521,6 +5530,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5874,6 +5884,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6844,6 +6855,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7476,6 +7488,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7749,6 +7762,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8055,6 +8069,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8253,6 +8268,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8373,6 +8389,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8425,6 +8442,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8553,6 +8571,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8884,6 +8903,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_4";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_4";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_4";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_4";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_4";
@ -2413,6 +2416,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3571,6 +3575,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4511,6 +4516,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4523,6 +4529,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4834,6 +4841,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5152,6 +5160,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5517,6 +5526,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5870,6 +5880,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6838,6 +6849,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7469,6 +7481,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7742,6 +7755,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8046,6 +8060,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8244,6 +8259,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8364,6 +8380,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8416,6 +8433,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8544,6 +8562,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8875,6 +8894,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_4";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_4";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_4";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_4";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_4";
@ -2413,6 +2416,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3571,6 +3575,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4511,6 +4516,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4523,6 +4529,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4834,6 +4841,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5152,6 +5160,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5517,6 +5526,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5870,6 +5880,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6838,6 +6849,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7468,6 +7480,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7741,6 +7754,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8045,6 +8059,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8243,6 +8258,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8363,6 +8379,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8415,6 +8432,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8543,6 +8561,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8874,6 +8893,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2413,6 +2416,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3571,6 +3575,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4510,6 +4515,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4522,6 +4528,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4833,6 +4840,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5150,6 +5158,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5515,6 +5524,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5868,6 +5878,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6836,6 +6847,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7466,6 +7478,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7739,6 +7752,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8043,6 +8057,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8241,6 +8256,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8361,6 +8377,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8413,6 +8430,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8541,6 +8559,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8872,6 +8891,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2413,6 +2416,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3570,6 +3574,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4509,6 +4514,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4521,6 +4527,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4831,6 +4838,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5148,6 +5156,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5513,6 +5522,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5866,6 +5876,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6834,6 +6845,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7464,6 +7476,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7736,6 +7749,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8040,6 +8054,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8238,6 +8253,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8358,6 +8374,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8410,6 +8427,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8538,6 +8556,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8869,6 +8888,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2413,6 +2416,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3569,6 +3573,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4508,6 +4513,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4520,6 +4526,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4830,6 +4837,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5147,6 +5155,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5512,6 +5521,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5865,6 +5875,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6832,6 +6843,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7462,6 +7474,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7734,6 +7747,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8037,6 +8051,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8235,6 +8250,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8355,6 +8371,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8407,6 +8424,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8535,6 +8553,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8866,6 +8885,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2412,6 +2415,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3566,6 +3570,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4505,6 +4510,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4517,6 +4523,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4827,6 +4834,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5144,6 +5152,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5508,6 +5517,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5861,6 +5871,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6828,6 +6839,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7458,6 +7470,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7730,6 +7743,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8033,6 +8047,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8231,6 +8246,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8351,6 +8367,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8403,6 +8420,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8531,6 +8549,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8862,6 +8881,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2410,6 +2413,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3562,6 +3566,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4501,6 +4506,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4513,6 +4519,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4823,6 +4830,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5140,6 +5148,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5504,6 +5513,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5857,6 +5867,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6823,6 +6834,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7453,6 +7465,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7725,6 +7738,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8028,6 +8042,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8226,6 +8241,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8346,6 +8362,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8398,6 +8415,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8526,6 +8544,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8857,6 +8876,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2409,6 +2412,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3560,6 +3564,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4499,6 +4504,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4511,6 +4517,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4821,6 +4828,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5138,6 +5146,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5502,6 +5511,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5855,6 +5865,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6820,6 +6831,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7450,6 +7462,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7722,6 +7735,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8024,6 +8038,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8222,6 +8237,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8342,6 +8358,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8394,6 +8411,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8522,6 +8540,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8853,6 +8872,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1171,6 +1172,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1264,6 +1266,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
@ -2409,6 +2412,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_2";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3559,6 +3563,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4498,6 +4503,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4510,6 +4516,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4820,6 +4827,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5137,6 +5145,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5501,6 +5510,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5853,6 +5863,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6818,6 +6829,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7448,6 +7460,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7711,6 +7724,7 @@ self: super: {
  "snow-white" = dontDistribute super."snow-white";
  "snowball" = dontDistribute super."snowball";
  "snowglobe" = dontDistribute super."snowglobe";
+  "soap" = doDistribute super."soap_0_2_2_7";
  "sock2stream" = dontDistribute super."sock2stream";
  "sockaddr" = dontDistribute super."sockaddr";
  "socket" = dontDistribute super."socket";
@ -7719,6 +7733,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8021,6 +8036,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8219,6 +8235,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8339,6 +8356,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8391,6 +8409,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8519,6 +8538,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8850,6 +8870,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@ -113,6 +113,7 @@ self: super: {
  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
  "BigPixel" = dontDistribute super."BigPixel";
  "Binpack" = dontDistribute super."Binpack";
  "Biobase" = dontDistribute super."Biobase";
@ -1175,6 +1176,7 @@ self: super: {
  "aeson-filthy" = dontDistribute super."aeson-filthy";
  "aeson-flatten" = dontDistribute super."aeson-flatten";
  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
  "aeson-lens" = dontDistribute super."aeson-lens";
  "aeson-native" = dontDistribute super."aeson-native";
  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@ -1269,6 +1271,7 @@ self: super: {
  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_3";
  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_3";
+  "amazonka-cognito-idp" = dontDistribute super."amazonka-cognito-idp";
  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_3";
  "amazonka-config" = doDistribute super."amazonka-config_0_3_3";
  "amazonka-core" = doDistribute super."amazonka-core_0_3_3";
@ -2423,6 +2426,7 @@ self: super: {
  "crypto-totp" = dontDistribute super."crypto-totp";
  "cryptohash" = doDistribute super."cryptohash_0_11_6";
  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
  "cryptol" = doDistribute super."cryptol_2_2_1";
  "cryptonite" = dontDistribute super."cryptonite";
@ -3587,6 +3591,7 @@ self: super: {
  "github" = dontDistribute super."github";
  "github-backup" = dontDistribute super."github-backup";
  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-release" = dontDistribute super."github-release";
  "github-types" = dontDistribute super."github-types";
  "github-utils" = dontDistribute super."github-utils";
  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
@ -4530,6 +4535,7 @@ self: super: {
  "hotswap" = dontDistribute super."hotswap";
  "hourglass" = doDistribute super."hourglass_0_2_9";
  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
  "hp2any-core" = dontDistribute super."hp2any-core";
  "hp2any-graph" = dontDistribute super."hp2any-graph";
  "hp2any-manager" = dontDistribute super."hp2any-manager";
@ -4542,6 +4548,7 @@ self: super: {
  "hpapi" = dontDistribute super."hpapi";
  "hpaste" = dontDistribute super."hpaste";
  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
  "hpc-strobe" = dontDistribute super."hpc-strobe";
  "hpc-tracer" = dontDistribute super."hpc-tracer";
@ -4855,6 +4862,7 @@ self: super: {
  "hw-bits" = dontDistribute super."hw-bits";
  "hw-conduit" = dontDistribute super."hw-conduit";
  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-json" = dontDistribute super."hw-json";
  "hw-parser" = dontDistribute super."hw-parser";
  "hw-prim" = dontDistribute super."hw-prim";
  "hw-rankselect" = dontDistribute super."hw-rankselect";
@ -5177,6 +5185,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
  "json-b" = dontDistribute super."json-b";
@ -5543,6 +5552,7 @@ self: super: {
  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
  "liquidhaskell" = dontDistribute super."liquidhaskell";
  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
  "lispparser" = dontDistribute super."lispparser";
  "list-extras" = dontDistribute super."list-extras";
  "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@ -5896,6 +5906,7 @@ self: super: {
  "monad-connect" = dontDistribute super."monad-connect";
  "monad-control" = doDistribute super."monad-control_1_0_0_4";
  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
  "monad-exception" = dontDistribute super."monad-exception";
  "monad-extras" = dontDistribute super."monad-extras";
  "monad-fork" = dontDistribute super."monad-fork";
@ -6868,6 +6879,7 @@ self: super: {
  "proteaaudio" = dontDistribute super."proteaaudio";
  "protobuf" = dontDistribute super."protobuf";
  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protobuf-simple" = dontDistribute super."protobuf-simple";
  "protocol-buffers" = dontDistribute super."protocol-buffers";
  "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor";
  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
@ -7503,6 +7515,7 @@ self: super: {
  "servant-pandoc" = dontDistribute super."servant-pandoc";
  "servant-pool" = dontDistribute super."servant-pool";
  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
  "servant-response" = dontDistribute super."servant-response";
  "servant-scotty" = dontDistribute super."servant-scotty";
  "servant-server" = doDistribute super."servant-server_0_2_4";
@ -7777,6 +7790,7 @@ self: super: {
  "socket-sctp" = dontDistribute super."socket-sctp";
  "socketio" = dontDistribute super."socketio";
  "socketson" = dontDistribute super."socketson";
+  "socks" = doDistribute super."socks_0_5_4";
  "soegtk" = dontDistribute super."soegtk";
  "solr" = dontDistribute super."solr";
  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@ -8090,6 +8104,7 @@ self: super: {
  "system-inotify" = dontDistribute super."system-inotify";
  "system-lifted" = dontDistribute super."system-lifted";
  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
  "system-util" = dontDistribute super."system-util";
  "system-uuid" = dontDistribute super."system-uuid";
@ -8288,6 +8303,7 @@ self: super: {
  "th-sccs" = dontDistribute super."th-sccs";
  "th-traced" = dontDistribute super."th-traced";
  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
  "themoviedb" = dontDistribute super."themoviedb";
  "themplate" = dontDistribute super."themplate";
  "theoremquest" = dontDistribute super."theoremquest";
@ -8410,6 +8426,7 @@ self: super: {
  "trace-function-call" = dontDistribute super."trace-function-call";
  "traced" = dontDistribute super."traced";
  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
  "tracker" = dontDistribute super."tracker";
  "tracy" = dontDistribute super."tracy";
  "trajectory" = dontDistribute super."trajectory";
@ -8462,6 +8479,7 @@ self: super: {
  "tsparse" = dontDistribute super."tsparse";
  "tst" = dontDistribute super."tst";
  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
  "ttrie" = dontDistribute super."ttrie";
  "tttool" = doDistribute super."tttool_1_3";
  "tubes" = dontDistribute super."tubes";
@ -8590,6 +8608,7 @@ self: super: {
  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
  "unboxed-containers" = dontDistribute super."unboxed-containers";
  "unbreak" = dontDistribute super."unbreak";
+  "uncertain" = dontDistribute super."uncertain";
  "unexceptionalio" = dontDistribute super."unexceptionalio";
  "unfoldable" = dontDistribute super."unfoldable";
  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
@ -8921,6 +8940,7 @@ self: super: {
  "web-routing" = dontDistribute super."web-routing";
  "webapi" = dontDistribute super."webapi";
  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
  "webcrank" = dontDistribute super."webcrank";
  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
  "webcrank-wai" = dontDistribute super."webcrank-wai";
--- a/Show More
+++ b/Show More