Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-03-05 18:55:30 +01:00 · 2016-03-05 18:55:30 +01:00 · cb3d27df93
commit cb3d27df93
parent aff1f4ab94 4e8853ca8d
175 changed files with 11585 additions and 8679 deletions
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@ -117,9 +117,10 @@ Also, the attributes `haskell.compiler.ghcXYC` and

 ### How to install a compiler

-A simple development environment consists of a Haskell compiler and the tool
-`cabal-install`, and we saw in section [How to install Haskell packages] how
-you can install those programs into your user profile:
+A simple development environment consists of a Haskell compiler and one or both
+of the tools `cabal-install` and `stack`. We saw in section
+[How to install Haskell packages] how you can install those programs into your
+user profile:

    $ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install

@ -148,10 +149,16 @@ version; just enter the Nix shell environment with the command

    $ nix-shell -p haskell.compiler.ghc784

-to bring GHC 7.8.4 into `$PATH`. Re-running `cabal configure` switches your
-build to use that compiler instead. If you're working on a project that doesn't
-depend on any additional system libraries outside of GHC, then it's sufficient
-even to run the `cabal configure` command inside of the shell:
+to bring GHC 7.8.4 into `$PATH`. Alternatively, you can use Stack instead of
+`nix-shell` directly to select compiler versions and other build tools
+per-project. It uses `nix-shell` under the hood when Nix support is turned on.
+See [How to build a Haskell project using Stack].
+
+If you're using `cabal-install`, re-running `cabal configure` inside the spawned
+shell switches your build to use that compiler instead. If you're working on
+a project that doesn't depend on any additional system libraries outside of GHC,
+then it's even sufficient to just run the `cabal configure` command inside of
+the shell:

    $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure"

@ -320,6 +327,58 @@ security reasons, which might be quite an inconvenience. See [this
 page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for
 workarounds.

+### How to build a Haskell project using Stack
+
+[Stack][http://haskellstack.org] is a popular build tool for Haskell projects.
+It has first-class support for Nix. Stack can optionally use Nix to
+automatically select the right version of GHC and other build tools to build,
+test and execute apps in an existing project downloaded from somewhere on the
+Internet. Pass the `--nix` flag to any `stack` command to do so, e.g.
+
+    $ git clone --recursive http://github.com/yesodweb/wai
+    $ cd wai
+    $ stack --nix build
+
+If you want `stack` to use Nix by default, you can add a `nix` section to the
+`stack.yaml` file, as explained in the [Stack documentation][stack-nix-doc]. For
+example:
+
+    nix:
+      enable: true
+      packages: [pkgconfig zeromq zlib]
+
+The example configuration snippet above tells Stack to create an ad hoc
+environment for `nix-shell` as in the below section, in which the `pkgconfig`,
+`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands
+will implicitly be executed inside this ad hoc environment.
+
+Some projects have more sophisticated needs. For examples, some ad hoc
+environments might need to expose Nixpkgs packages compiled in a certain way, or
+with extra environment variables. In these cases, you'll need a `shell` field
+instead of `packages`:
+
+    nix:
+      enable: true
+      shell-file: shell.nix
+
+For more on how to write a `shell.nix` file see the below section. You'll need
+to express a derivation. Note that Nixpkgs ships with a convenience wrapper
+function around `mkDerivation` called `haskell.lib.buildStackProject` to help you
+create this derivation in exactly the way Stack expects. All of the same inputs
+as `mkDerivation` can be provided. For example, to build a Stack project that
+including packages that link against a version of the R library compiled with
+special options turned on:
+
+    with (import <nixpkgs> { });
+
+    let R = pkgs.R.override { enableStrictBarrier = true; };
+    in
+	haskell.lib.buildStackProject {
+      name = "HaskellR";
+	  buildInputs = [ R zeromq zlib ];
+    }
+
+[stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html

 ### How to create ad hoc environments for `nix-shell`

@ -605,7 +664,7 @@ can configure the environment variables

 in their `~/.bashrc` file to avoid the compiler error.

-### Using Stack together with Nix
+### Builds using Stack complain about missing system libraries

    --  While building package zlib-0.5.4.2 using:
      runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...]
@ -633,13 +692,16 @@ means specific to Stack: you'll have that problem with any other
 Haskell package that's built inside of nix-shell but run outside of that
 environment.

-I suppose we could try to remedy the issue by wrapping `stack` or
-`cabal` with a script that tries to find those kind of implicit search
-paths and makes them explicit on the "cabal configure" command line. I
-don't think anyone is working on that subject yet, though, because the
-problem doesn't seem so bad in practice.
+You can remedy this issue in several ways. The easiest is to add a `nix` section
+to the `stack.yaml` like the following:

-You can remedy that issue in several ways. First of all, run
+    nix:
+      enable: true
+	  packages: [ zlib ]
+
+Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an
+`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you
+can achieve the same effect by hand. First of all, run

    $ nix-build --no-out-link "<nixpkgs>" -A zlib
    /nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8
@ -663,7 +725,8 @@ to find out the store path of the system's zlib library. Now, you can
   Typically, you'll need --extra-include-dirs as well. It's possible
   to add those flag to the project's "stack.yaml" or your user's
   global "~/.stack/global/stack.yaml" file so that you don't have to
-   specify them manually every time.
+   specify them manually every time. But again, you're likely better off using
+   Stack's Nix support instead.

   The same thing applies to `cabal configure`, of course, if you're
   building with `cabal-install` instead of Stack.
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -10,6 +10,7 @@
  aaronschif = "Aaron Schif <aaronschif@gmail.com>";
  abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
  abbradar = "Nikolay Amiantov <ab@fmap.me>";
+  aboseley = "Adam Boseley <adam.boseley@gmail.com>";
  adev = "Adrien Devresse <adev@adev.name>";
  aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
  aflatter = "Alexander Flatter <flatter@fastmail.fm>";
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -253,6 +253,7 @@
      pdnsd = 229;
      octoprint = 230;
      avahi-autoipd = 231;
+      nntp-proxy = 232;

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

--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -240,6 +240,7 @@
  ./services/misc/ripple-data-api.nix
  ./services/misc/rogue.nix
  ./services/misc/siproxd.nix
+  ./services/misc/spice-vdagentd.nix
  ./services/misc/subsonic.nix
  ./services/misc/sundtek.nix
  ./services/misc/svnserve.nix
@ -322,7 +323,6 @@
  ./services/networking/hostapd.nix
  ./services/networking/i2pd.nix
  ./services/networking/i2p.nix
-  ./services/networking/ifplugd.nix
  ./services/networking/iodined.nix
  ./services/networking/ircd-hybrid/default.nix
  ./services/networking/kippo.nix
@ -338,6 +338,7 @@
  ./services/networking/networkmanager.nix
  ./services/networking/ngircd.nix
  ./services/networking/nix-serve.nix
+  ./services/networking/nntp-proxy.nix
  ./services/networking/nsd.nix
  ./services/networking/ntopng.nix
  ./services/networking/ntpd.nix
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@ -17,6 +17,7 @@
    pkgs.ddrescue
    pkgs.ccrypt
    pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.which # 88K size

    # Some networking tools.
    pkgs.fuse
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@ -56,7 +56,7 @@ in
      */

      shellAliases = mkOption {
-        default = config.environment.shellAliases // { which = "type -P"; };
+        default = config.environment.shellAliases;
        description = ''
          Set of aliases for bash shell. See <option>environment.shellAliases</option>
          for an option format description.
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@ -49,7 +49,12 @@ in {

      domains = mkOption {
        type = types.str;
-        description = "Local domains set; messages from them are signed, not verified.";
+        default = "csl:${config.networking.hostName}";
+        example = "csl:example.com,mydomain.net";
+        description = ''
+          Local domains set (see <literal>opendkim(8)</literal> for more information on datasets).
+          Messages from them are signed, not verified.
+        '';
      };

      keyFile = mkOption {
@ -77,8 +82,6 @@ in {

  config = mkIf cfg.enable {

-    services.opendkim.domains = mkDefault "csl:${config.networking.hostName}";
-
    users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton
      { name = "opendkim";
        group = cfg.group;
--- a/nixos/modules/services/misc/spice-vdagentd.nix
+++ b/nixos/modules/services/misc/spice-vdagentd.nix
@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.spice-vdagentd;
+in
+{
+  options = {
+    services.spice-vdagentd = {
+      enable = mkEnableOption "Spice guest vdagent daemon";
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.spice-vdagent ];
+
+    systemd.services.spice-vdagentd = {
+      description = "spice-vdagent daemon";
+      wantedBy = [ "graphical.target" ];
+      preStart = ''
+        mkdir -p "/var/run/spice-vdagentd/"
+      '';
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'";
+      };
+    };
+  };
+}
--- a/nixos/modules/services/networking/ifplugd.nix
+++ b/nixos/modules/services/networking/ifplugd.nix
@ -1,82 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  inherit (pkgs) ifplugd;
-
-  cfg = config.networking.interfaceMonitor;
-
-  # The ifplugd action script, which is called whenever the link
-  # status changes (i.e., a cable is plugged in or unplugged).
-  plugScript = pkgs.writeScript "ifplugd.action"
-    ''
-      #! ${pkgs.stdenv.shell}
-      iface="$1"
-      status="$2"
-      ${cfg.commands}
-    '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    networking.interfaceMonitor.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, monitor Ethernet interfaces for
-        cables being plugged in or unplugged.  When this occurs, the
-        commands specified in
-        <option>networking.interfaceMonitor.commands</option> are
-        executed.
-      '';
-    };
-
-    networking.interfaceMonitor.beep = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, beep when an Ethernet cable is
-        plugged in or unplugged.
-      '';
-    };
-
-    networking.interfaceMonitor.commands = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands to be executed when the link status of an
-        interface changes.  On invocation, the shell variable
-        <varname>iface</varname> contains the name of the interface,
-        while the variable <varname>status</varname> contains either
-        <literal>up</literal> or <literal>down</literal> to indicate
-        the new status.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    systemd.services.ifplugd = {
-      description = "Network interface connectivity monitor";
-      after = [ "network-interfaces.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
-          ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
-          --run ${plugScript}
-      '';
-    };
-
-    environment.systemPackages = [ ifplugd ];
-  };
-}
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@ -21,6 +21,9 @@ let

    [logging]
    level=WARN
+
+    [connection]
+    ipv6.ip6-privacy=2
  '';

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

+      all_proxy = mkOption {
+        type = types.string;
+        default = "";
+        example = "socks5://address.com:1234";
+        description = ''
+          Overwrites all_proxy environment variable for the syncthing process to
+          the given value. This is normaly used to let relay client connect
+          through SOCKS5 proxy server.
+        '';
+      };
+
      dataDir = mkOption {
        default = "/var/lib/syncthing";
        description = ''
@ -51,7 +62,6 @@ in
      };


-
    };

  };
@ -66,8 +76,13 @@ in
        description = "Syncthing service";
        after = [ "network.target" ];
        wantedBy = [ "multi-user.target" ];
-        environment.STNORESTART = "yes";  # do not self-restart
-        environment.STNOUPGRADE = "yes";
+        environment = {
+          STNORESTART = "yes";  # do not self-restart
+          STNOUPGRADE = "yes";
+        } //
+        (config.networking.proxy.envVars) //
+        (if cfg.all_proxy != "" then { all_proxy = cfg.all_proxy; } else {});
+
        serviceConfig = {
          User = "${cfg.user}";
          PermissionsStartOnly = true;
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@ -16,6 +16,7 @@ let

    ${cfg.daemon.extraConfig}
  '';
+  pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; };
 in
 {
  options = {
@ -54,7 +55,7 @@ in
  };

  config = mkIf cfg.updater.enable or cfg.daemon.enable {
-    environment.systemPackages = [ pkgs.clamav ];
+    environment.systemPackages = [ pkg ];
    users.extraUsers = singleton {
      name = clamavUser;
      uid = config.ids.uids.clamav;
@ -76,7 +77,7 @@ in

    systemd.services.clamd = mkIf cfg.daemon.enable {
      description = "ClamAV daemon (clamd)";
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
      after = [ "network.target" "freshclam.service" ];
      requires = [ "freshclam.service" ];
      wantedBy = [ "multi-user.target" ];
@ -87,7 +88,7 @@ in
        chown ${clamavUser}:${clamavGroup} ${runDir}
      '';
      serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/clamd --config-file=${clamdConfigFile}";
+        ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}";
        Type = "forking";
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        Restart = "on-failure";
@ -100,13 +101,13 @@ in
      description = "ClamAV updater (freshclam)";
      after = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
      preStart = ''
        mkdir -m 0755 -p ${stateDir}
        chown ${clamavUser}:${clamavGroup} ${stateDir}
      '';
      serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+        ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        Restart = "on-failure";
        RestartSec = "10s";
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@ -1,7 +1,7 @@
-{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch
+{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
 # deadbeef can use either gtk2 or gtk3
-, gtk2Support ? true, gtk2 ? null
-, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+, gtk2Support ? false, gtk2 ? null
+, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
 # input plugins
 , vorbisSupport ? true, libvorbis ? null
 , mp123Support ? true, libmad ? null
@ -52,21 +52,22 @@ assert wavpackSupport -> wavpack != null;
 assert remoteSupport -> curl != null;

 stdenv.mkDerivation rec {
-  name = "deadbeef-0.6.2";
+  name = "deadbeef-${version}";
+  version = "0.7.0";

  src = fetchurl {
    url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
-    sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
+    sha256 = "0s6qip1zs83pig75pnd30ayiv1dbbj7s72px9mr31f4m0v86kaqx";
  };

-  buildInputs = with stdenv.lib;
-       optional gtk2Support gtk2
-    ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas]
+  buildInputs = with stdenv.lib; [ jansson ]
+    ++ optional gtk2Support gtk2
+    ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
    ++ optional vorbisSupport libvorbis
    ++ optional mp123Support libmad
    ++ optional flacSupport flac
    ++ optional wavSupport libsndfile
-    ++ optionals cdaSupport [libcdio libcddb]
+    ++ optionals cdaSupport [ libcdio libcddb ]
    ++ optional aacSupport faad2
    ++ optional zipSupport libzip
    ++ optional ffmpegSupport ffmpeg
@ -88,12 +89,6 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  patches = [ (fetchpatch {
-                url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
-                sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599";
-              })
-            ];
-
  postInstall = if !gtk3Support then "" else ''
    wrapProgram "$out/bin/deadbeef" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
 , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-,  zita-convolver, zita-resampler
+, webkitgtk2, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:

@ -11,11 +11,11 @@ in

 stdenv.mkDerivation rec {
  name = "guitarix-${version}";
-  version = "0.33.0";
+  version = "0.34.0";

  src = fetchurl {
    url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx";
+    sha256 = "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8";
  };

  nativeBuildInputs = [ gettext intltool pkgconfig python ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2
    ladspaH librdf libsndfile lilv lv2 serd sord sratom
-    zita-convolver zita-resampler
+    webkitgtk2 zita-convolver zita-resampler
  ];

  configureFlags = [
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
+
+stdenv.mkDerivation rec {
+  name = "lv2bm-${version}";
+  version = "git-2015-04-10";
+
+  src = fetchFromGitHub {
+    owner = "portalmod";
+    repo = "lv2bm";
+    rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3";
+    sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj";
+  };
+
+  buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/portalmod/lv2bm;
+    description = "A benchmark tool for LV2 plugins";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@ -11,25 +11,25 @@
 }:

 stdenv.mkDerivation rec {
-  version = "2.8.0";
+  version = "2.9.0";
  name = "sonic-pi-${version}";

  src = fetchFromGitHub {
    owner = "samaaron";
    repo = "sonic-pi";
    rev = "v${version}";
-    sha256 = "1yyavgazb6ar7xnmjx460s9p8nh70klaja2yb20nci15k8vngq9h";
+    sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
  };

  buildInputs = [
-    qscintilla
-    supercollider
-    ruby
-    qt48Full
-    cmake
-    pkgconfig
    bash
+    cmake
    makeWrapper
+    pkgconfig
+    qscintilla
+    qt48Full
+    ruby
+    supercollider
  ];

  meta = {
@ -42,13 +42,22 @@ stdenv.mkDerivation rec {

  dontUseCmakeConfigure = true;

+  patches = [ ./fixed-prefixes.patch ];
+
+  preConfigure = ''
+    patchShebangs .
+    substituteInPlace app/gui/qt/mainwindow.cpp \
+      --subst-var-by ruby "${ruby}/bin/ruby" \
+      --subst-var out
+  '';
+
  buildPhase = ''
    pushd app/server/bin
-    ${ruby}/bin/ruby compile-extensions.rb
+      ./compile-extensions.rb
    popd

    pushd app/gui/qt
-    ${bash}/bin/bash rp-build-app
+      ./rp-build-app
    popd
  '';

--- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
+++ b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
@ -0,0 +1,36 @@
+diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
+index 0af6cf7..97c17ad 100644
+--- a/app/gui/qt/mainwindow.cpp
+++ b/app/gui/qt/mainwindow.cpp
+@@ -677,28 +677,9 @@ void MainWindow::startServer(){
+ 
+     serverProcess = new QProcess();
+ 
+-    QString root = rootPath();
+-
+-  #if defined(Q_OS_WIN)
+-    QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #elif defined(Q_OS_MAC)
+-    QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
+-    QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #else
+-    //assuming Raspberry Pi
+-    QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
+-    QFile file(prg_path);
+-    if(!file.exists()) {
+-      // use system ruby if bundled ruby doesn't exist
+-      prg_path = "/usr/bin/ruby";
+-    }
+-
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #endif
+    QString prg_path = "@ruby@";
+    QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
+    sample_path = "@out@/etc/samples";
+ 
+     prg_path = QDir::toNativeSeparators(prg_path);
+     prg_arg = QDir::toNativeSeparators(prg_arg);
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
+  pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
+  vala, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  name = "font-manager-${version}";
+  version = "git-2016-03-02";
+
+  src = fetchFromGitHub {
+    owner  = "FontManager";
+    repo   = "master";
+    rev    = "743fb83558c86bfbbec898106072f84422c175d6";
+    sha256 = "1sakss6irfr3d8k39x1rf72fmnpq47akhyrv3g45a3l6v6xfqp3k";
+    };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    makeWrapper
+    pkgconfig
+    automake autoconf libtool
+    file
+    intltool
+    libxml2
+    json_glib
+    sqlite
+    itstool
+    vala
+    gnome3.gtk
+    gnome3.gucharmap
+    gnome3.libgee
+    gnome3.file-roller
+    gnome3.yelp_tools
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=true ./autogen.sh
+    chmod +x configure;
+    substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  configureFlags = "--disable-pycompile";
+
+  preFixup = ''
+    for prog in "$out/bin/"* "$out/libexec/font-manager/"*; do
+      wrapProgram "$prog" \
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = {
+    homepage = https://fontmanager.github.io/;
+    description = "Simple font management for GTK+ desktop environments";
+    longDescription = ''
+      Font Manager is intended to provide a way for average users to
+      easily manage desktop fonts, without having to resort to command
+      line tools or editing configuration files by hand. While designed
+      primarily with the Gnome Desktop Environment in mind, it should
+      work well with other Gtk+ desktop environments.
+
+      Font Manager is NOT a professional-grade font management solution.
+    '';
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    repositories.git = https://github.com/FontManager/master;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "gsimplecal-${version}";
+  version = "2.1";
+
+  src = fetchurl {
+    url = "https://github.com/dmedvinsky/gsimplecal/archive/v${version}.tar.gz";
+    sha256 = "1sa05ifjp41xipfspk5n6l3wzpzmp3i45q88l01p4l6k6drsq336";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig automake autoconf gtk3 ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://dmedvinsky.github.io/gsimplecal/;
+    description = "Lightweight calendar application written in C++ using GTK";
+    longDescription = ''
+      gsimplecal was intentionally made for use with tint2 panel in the
+      openbox environment to be launched upon clock click, but of course it
+      will work without it. In fact, binding the gsimplecal to some hotkey in
+      you window manager will probably make you happy. The thing is that when
+      it is started it first shows up, when you run it again it closes the
+      running instance. In that way it is very easy to integrate anywhere. No
+      need to write some wrapper scripts or whatever.
+
+      Also, you can configure it to not only show the calendar, but also
+      display multiple clocks for different world time zones.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgs, pythonPackages }:
+{ stdenv, fetchurl, pkgs, python2Packages }:

-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
  version = "0.8.1";
  name = "khard-${version}";
  namePrefix = "";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
  };

-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
    atomicwrites
    configobj
    vobject
@ -18,10 +18,6 @@ pythonPackages.buildPythonApplication rec {
    pyyaml
  ];

-  buildInputs = with pythonPackages; [
-    pkgs.vdirsyncer
-  ];
-
  meta = {
    homepage = https://github.com/scheibler/khard;
    description = "Console carddav client";
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@ -8,13 +8,13 @@ in {

  m3d-fio = buildPlugin rec {
    name = "M3D-Fio-${version}";
-    version = "0.27.1";
+    version = "0.29";

    src = fetchFromGitHub {
      owner = "donovan6000";
      repo = "M3D-Fio";
      rev = "V${version}";
-      sha256 = "0jfb417wgdq6fzpxwq6xrrlpkndjwq69h4cdm0ixbyqkp7a3kcm2";
+      sha256 = "1ifbq7yibq42jjvqvklnx3qzr6vk2ngsxh3xhlbdrhqrg54gky4r";
    };

    patches = [
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:

 stdenv.mkDerivation rec {
-  name = "openbox-menu-0.5.1";
+  name = "openbox-menu-${version}";
+  version = "0.8.0";

  src = fetchurl {
    url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
-    sha256 = "11v3nlhqcnks5vms1a7rrvwvj8swc9axgjkp7z0r97lijsg6d3rj";
+    sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
  };

  buildInputs = [ pkgconfig glib gtk menu-cache ];
@ -15,8 +16,13 @@ stdenv.mkDerivation rec {
  installPhase = "make install prefix=$out";

  meta = {
+    homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
    description = "Dynamic XDG menu generator for Openbox";
-    homepage = "http://mimasgpc.free.fr/openbox-menu.html";
+    longDescription = ''
+      Openbox-menu is a pipemenu for Openbox window manager. It provides a
+      dynamic menu listing installed applications. Most of the work is done by
+      the LXDE library menu-cache.
+    '';
    license = stdenv.lib.licenses.gpl3;
    maintainers = [ stdenv.lib.maintainers.romildo ];
    platforms   = stdenv.lib.platforms.unix;
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@ -1,20 +1,33 @@
-{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
+{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
 , gtk3, gsettings_desktop_schemas, p7zip }:

 let

+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
+  # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
+  extensionOf = filePath: 
+    lib.concatStringsSep "." (lib.tail (lib.splitString "." 
+      (builtins.baseNameOf filePath)));
+
+  installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
+    mkdir -p "$out/share/icons/hicolor/${size}/apps"
+    ln -s -T "${iconFile}" "$out/share/icons/hicolor/${size}/apps/${iconName}.${extensionOf iconFile}"
+  '') icons);
+
  mkSweetHome3D =
-  { name, module, version, src, license, description, icon }:
+  { name, module, version, src, license, description, desktopName, icons }:

  stdenv.mkDerivation rec {
-    inherit name version src description icon;
+    inherit name version src description;
    exec = stdenv.lib.toLower module;
    sweethome3dItem = makeDesktopItem {
-      inherit name exec icon;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
+      icon = getDesktopFileName name;
      comment =  description;
-      desktopName = name;
      genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
    };

    buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];
@ -29,7 +42,11 @@ let
    installPhase = ''
      mkdir -p $out/bin
      cp install/${module}-${version}.jar $out/share/java/.
+
+      ${installIcons (getDesktopFileName name) icons}
+
      cp "${sweethome3dItem}/share/applications/"* $out/share/applications
+
      makeWrapper ${jre}/bin/java $out/bin/$exec \
        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
        --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
@ -51,20 +68,27 @@ let
 in rec {

  application = mkSweetHome3D rec {
-    version = "4.6.2";
+    version = "5.2";
    module = "SweetHome3D";
    name = stdenv.lib.toLower module + "-application-" + version;
    description = "Design and visualize your future home";
    license = stdenv.lib.licenses.gpl2Plus;
    src = fetchcvs {
      cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz";
+      sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb";
      module = module;
      tag = "V_" + d2u version;
    };
-    icon = fetchurl {
-      url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png";
-      sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92";
+    desktopName = "Sweet Home 3D";
+    icons = {
+      "32x32" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon32x32.png";
+        sha256 = "1r2fhfg27mx00nfv0qj66rhf719s2g1vhdis7bdc9mqk9x0mb0ir";
+      };
+      "48x48" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon48x48.png";
+        sha256 = "1ap6d75dyqqvx21wddvn8vw2apq3v803vmbxdriwd0dw9rq3zn4g";
+      };
    };
  };

--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@ -9,19 +9,21 @@ let
    + "-editor";
  sweetName = m: v: sweetExec m + "-" + v;

+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
  mkEditorProject =
-  { name, module, version, src, license, description }:
+  { name, module, version, src, license, description, desktopName }:

  stdenv.mkDerivation rec {
    application = sweethome3dApp;
    inherit name module version src description;
    exec = sweetExec module;
    editorItem = makeDesktopItem {
-      inherit name exec;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
      comment =  description;
-      desktopName = name;
      genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
    };

    buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ];
@ -61,31 +63,33 @@ let
 in {

  textures-editor = mkEditorProject rec {
-    version = "1.4";
+    version = "1.5";
    module = "TexturesLibraryEditor";
    name = sweetName module version;
    description = "Easily create SH3T files and edit the properties of the texture images it contain";
    license = stdenv.lib.licenses.gpl2Plus;
    src = fetchcvs {
      cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "1j1ygb32dca48hng5bsna9f84vyin5qc3ds44xi39057izmw8499";
+      sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h";
      module = module;
      tag = "V_" + d2u version;
    };
+    desktopName = "Sweet Home 3D - Textures Library Editor";
  };

  furniture-editor = mkEditorProject rec {
-    version = "1.16";
+    version = "1.19";
    module = "FurnitureLibraryEditor";
    name = sweetName module version;
    description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
    license = stdenv.lib.licenses.gpl2;
    src = fetchcvs {
      cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374";
+      sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs";
      module = module;
      tag = "V_" + d2u version;
    };
+    desktopName = "Sweet Home 3D - Furniture Library Editor";
  };

 }
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "tasksh-${version}";
+  version = "1.0.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "http://taskwarrior.org/download/tasksh-latest.tar.gz";
+    sha256 = "0ll6pwhw4wsdffacsmpq46fqh084p9mdaa777giqbag3b8gwik4s";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "REPL for taskwarrior";
+    homepage = http://tasktools.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@ -46,7 +46,7 @@ in rec {
    in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
      urls = mkUrls "amd64";
      sha256 = chanAttrs.sha256bin64;
-    } else if stdenv.is32bit && chanAttrs ? sha256bin32 then {
+    } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then {
      urls = mkUrls "i386";
      sha256 = chanAttrs.sha256bin32;
    } else throw "No Chrome plugins are available for your architecture.";
@ -181,7 +181,8 @@ in rec {
    isLatest = channel: version: let
      ourVersion = sources.${channel}.version or null;
    in if ourVersion == null then false
-       else lib.versionAtLeast version sources.${channel}.version;
+       else lib.versionOlder version sources.${channel}.version
+         || version == sources.${channel}.version;

    # We only support GNU/Linux right now.
    linuxChannels = let
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, perl , taktuk}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.2";
+  name = "kanif-${version}";
+
+  propagateBuildInputs = [ perl taktuk ];
+
+  src = fetchurl {
+    url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
+  };
+
+  preBuild = ''
+      substituteInPlace ./kanif --replace "/usr/bin/perl" "${perl}/bin/perl"
+      substituteInPlace ./kanif --replace '$taktuk_command = "taktuk";' '$taktuk_command = "${taktuk}/bin/taktuk";'
+  '';
+
+  meta = {
+    description = "Cluster management and administration swiss army knife";
+    longDescription = ''
+      Kanif is a tool for high performance computing clusters management and
+      administration. It combines the main functionalities of well-known cluster
+      management tools such as c3, pdsh and dsh, and mimics their syntax. It
+      provides three tools to run the same command on several nodes ("parallel
+      ssh", using the 'kash' command), to broadcast the copy of files or
+      directories to several nodes ('kaput' command), and to gather several
+      remote files or directories locally ('kaget' command). It relies on TakTuk
+      for efficiency and scalability.'';
+    homepage = http://taktuk.gforge.inria.fr/kanif;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
+
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl , openssh}:
+
+stdenv.mkDerivation rec {
+  version = "3.7.5";
+  name = "taktuk-${version}";
+
+  buildInputs = [ perl ];
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
+    sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
+  };
+
+  preBuild = ''
+      substituteInPlace ./taktuk --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  meta = {
+    description = "Efficient, large scale, parallel remote execution of commands";
+    longDescription = ''
+      TakTuk allows one to execute commands in parallel on a potentially large set
+      of remote nodes (using ssh to connect to each node). It is typically used
+      inside high performance computing clusters and grids. It uses an adaptive
+      algorithm to efficiently distribute the work and sets up an interconnection
+      network to transport commands and perform I/Os multiplexing. It doesn't
+      require any specific software on the nodes thanks to a self-propagation
+      algorithm.'';
+    homepage = http://taktuk.gforge.inria.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;

 let
-  version = "2.0.0";
+  version = "2.0.2";
  variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in

@ -20,7 +20,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1pci4vj23wamycfj4lxxmpxps96yq6jfmqn7hdvisw4539v6q0lh";
+    sha256 = "1hdrnsllkfbvfwsvlqvvky0z91q63mbbnjcri56nb9c5403zn8g9";
  };

  buildInputs = [
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -15,10 +15,12 @@
 , defaultIconTheme, glib
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
+, kdeIntegration ? false
 }:

 let
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
+  lib = stdenv.lib;
+  langsSpaces = lib.concatStringsSep " " langs;
  major = "5";
  minor = "1";
  patch = "0";
@ -90,7 +92,6 @@ in stdenv.mkDerivation rec {
  '';

  QT4DIR = qt4;
-  KDE4DIR = kde4.kdelibs;

  # Fix boost 1.59 compat
  # Try removing in the next version
@ -178,7 +179,7 @@ in stdenv.mkDerivation rec {
    "--disable-report-builder"
    "--enable-python=system"
    "--enable-dbus"
-    "--enable-kde4"
+    (lib.enableFeature kdeIntegration "kde4")
    "--with-package-format=installed"
    "--enable-epm"
    "--with-jdk-home=${jdk.home}"
@ -230,7 +231,7 @@ in stdenv.mkDerivation rec {
    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
      CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
      freetype GConf getopt gnome_vfs gperf gtk3 gtk
-      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
+      hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
      libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
      libXaw libXext libXi libXinerama libxml2 libxslt libXtst
      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
@ -241,9 +242,10 @@ in stdenv.mkDerivation rec {
      libxshmfence libatomic_ops graphite2 harfbuzz
      librevenge libe-book libmwaw glm glew
      libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
-    ];
+    ]
+    ++ lib.optional kdeIntegration kde4.kdelibs;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
    homepage = http://libreoffice.org/;
    license = licenses.lgpl3;
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@ -1,14 +1,19 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
+}:

 stdenv.mkDerivation rec {
-  name = "stellarium-0.13.3";
+  name = "stellarium-0.14.2";

  src = fetchurl {
    url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
+    sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a";
  };

-  buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ];
+  buildInputs = [
+    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
+    qtserialport qttools
+  ];

  enableParallelBuilding = true;

--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@ -2,15 +2,20 @@

 stdenv.mkDerivation rec {
  name    = "why3-${version}";
-  version = "0.86.2";
+  version = "0.86.3";

  src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz;
-    sha256 = "08sa7dmp6yp29xn0m6h98nic4q47vb4ahvaid5drwh522pvwvg10";
+    url    = https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz;
+    sha256 = "0sph6i4ga9450bk60wpm5cq3psw3g8xprnac7yjfq64iqz1dyz03";
  };

-  buildInputs = with ocamlPackages;
-    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ];
+  buildInputs = (with ocamlPackages; [
+      ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
+    stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
+      coq coq.camlp5
+    ];
+
+  installTargets = [ "install" "install-lib" ];

  meta = with stdenv.lib; {
    description = "A platform for deductive program verification";
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@ -1,22 +1,30 @@

 { stdenv, fetchurl, cmake,
  singlePrec ? true,
-  fftw
+  mpiEnabled ? false,
+  fftw,
+  openmpi
 }:


 stdenv.mkDerivation {
-  name = "gromacs-4.6.5";
+  name = "gromacs-4.6.7";

  src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz";
-    sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz";
+    sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9";
  };

-  buildInputs = [cmake fftw];
+  buildInputs = [cmake fftw]
+  ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);

  cmakeFlags = ''
    ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
+    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE 
+                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1 
+                          -DGMX_OPENMP:BOOL=TRUE
+                          -DGMX_THREAD_MPI:BOOL=FALSE"
+                     else "-DGMX_MPI:BOOL=FALSE" }
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {

  # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
  propagatedBuildInputs = with pythonPackages; [
-     pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
+     pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
     httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
     jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
     WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
  # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
  propagatedBuildInputs = with pythonPackages; [
    pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
-    sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached
+    sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
    keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
    xmlsec MySQL_python

--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
  # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
  propagatedBuildInputs = with pythonPackages; [
   pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
-   jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six
+   jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
   stevedore pecan ryu networking-hyperv MySQL_python

   # clients
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {

  # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
  propagatedBuildInputs = with pythonPackages; [
-    pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography
+    pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
    webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
    netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
    stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@ -9,7 +9,7 @@ let
  stage1Flavours = [ "coreos" "fly" "host" ];

 in stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.1.0";
  name = "rkt-${version}";
  BUILDDIR="build-${name}";

@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
      rev = "v${version}";
      owner = "coreos";
      repo = "rkt";
-      sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
+      sha256 = "1pl5gbfd9wr8nh2h249g7sjs31jz21g24mw375zki9gdhhnpn570";
  };

  stage1BaseImage = fetchurl {
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@ -0,0 +1,29 @@
+{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
+ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes}:
+stdenv.mkDerivation rec {
+  name = "spice-vdagent-0.16.0";
+  src = fetchurl {
+    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
+    sha256 = "0z8gwc5va2i64mjippavmxajdb9az83ffqyhlbynm6dxw131d5av";
+  };
+  postPatch = ''
+    substituteInPlace data/spice-vdagent.desktop --replace /usr $out
+  '';
+  buildInputs = [ pkgconfig alsaLib spice_protocol glib
+                  libpciaccess libxcb libXrandr libXinerama libXfixes ] ;
+  meta = {
+    description = "Enhanced SPICE integration for linux QEMU guest";
+    longDescription = ''
+       Spice agent for linux guests offering
+       * Client mouse mode
+       * Copy and paste
+       * Automatic adjustment of the X-session resolution
+         to the client resolution
+       * Multiple displays
+    '';
+    homepage = http://www.spice-space.org/home.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.aboseley ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  pythonPath = with pythonPackages;
-    [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
+    [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes
      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
      distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
      # !!! should libvirt be a build-time dependency?  Note that
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }:
+
+python3Packages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "3.34";
+  pname = "i3pystatus";
+  disabled = !python3Packages.isPy3k;
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
+    sha256 = "1bpkkf9q4zqq7fh65zynbv26nq24rfznmw71jjvda7g8kjrwjdk5";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+    [ libpulseaudio ] ++ extraLibs;
+
+  ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudio}/lib\"";
+  makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
+
+  postInstall = ''
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      ${ldWrapperSuffix}
+  '';
+
+  # no tests in tarball
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/enkore/i3pystatus;
+    description = "A complete replacement for i3status";
+    longDescription = ''
+      i3pystatus is a growing collection of python scripts for status output compatible
+      to i3status / i3bar of the i3 window manager.
+    '';
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.igsha ];
+  };
+}
+
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, yacc }:

 let

@ -11,10 +11,17 @@ in stdenv.mkDerivation {
    url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
    sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
  };
+
+  buildInputs = [ yacc ];
+
  preConfigure = ''
    chmod +x ./configure
  '';

+  postConfigure = ''
+    rm as31/parser.c
+  '';
+
  meta = with stdenv.lib; {
    homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
    description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -930,4 +930,7 @@ self: super: {

  # https://github.com/mainland/language-c-quote/issues/57
  language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
+
+  # https://github.com/agda/agda/issues/1840
+  Agda = super.Agda.override { unordered-containers = self.unordered-containers_0_2_5_1; };
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -3777,6 +3777,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4347,7 +4348,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6314,6 +6317,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6329,6 +6333,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8343,6 +8348,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8368,6 +8374,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8652,6 +8659,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8698,6 +8706,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -3777,6 +3777,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4347,7 +4348,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6314,6 +6317,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6329,6 +6333,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8343,6 +8348,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8368,6 +8374,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8652,6 +8659,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8698,6 +8706,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -3777,6 +3777,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4347,7 +4348,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6314,6 +6317,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6329,6 +6333,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8343,6 +8348,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8368,6 +8374,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8652,6 +8659,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8698,6 +8706,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -3777,6 +3777,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4347,7 +4348,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6314,6 +6317,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6329,6 +6333,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8343,6 +8348,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8368,6 +8374,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8652,6 +8659,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8698,6 +8706,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -3776,6 +3776,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4344,7 +4345,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6311,6 +6314,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6326,6 +6330,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8339,6 +8344,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8364,6 +8370,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8648,6 +8655,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8694,6 +8702,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -3776,6 +3776,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4344,7 +4345,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6311,6 +6314,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6326,6 +6330,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8339,6 +8344,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8364,6 +8370,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8648,6 +8655,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8694,6 +8702,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -3775,6 +3775,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4342,7 +4343,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6309,6 +6312,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6324,6 +6328,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8336,6 +8341,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8361,6 +8367,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8645,6 +8652,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8691,6 +8699,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_1";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -3775,6 +3775,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4342,7 +4343,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6309,6 +6312,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6324,6 +6328,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8336,6 +8341,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8361,6 +8367,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8645,6 +8652,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8691,6 +8699,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_1";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -3765,6 +3765,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4332,7 +4333,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6298,6 +6301,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6313,6 +6317,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8323,6 +8328,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8348,6 +8354,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8631,6 +8638,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8677,6 +8685,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_1";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -3762,6 +3762,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4328,7 +4329,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6291,6 +6294,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6306,6 +6310,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8311,6 +8316,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8336,6 +8342,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8618,6 +8625,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8664,6 +8672,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_1";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -3753,6 +3753,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4317,7 +4318,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6271,6 +6274,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6286,6 +6290,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8284,6 +8289,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8309,6 +8315,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8590,6 +8597,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8636,6 +8644,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -3752,6 +3752,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4316,7 +4317,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6267,6 +6270,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6282,6 +6286,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8280,6 +8285,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8305,6 +8311,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8586,6 +8593,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8632,6 +8640,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -3752,6 +3752,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4315,7 +4316,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6266,6 +6269,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6281,6 +6285,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8278,6 +8283,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8303,6 +8309,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8584,6 +8591,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8630,6 +8638,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -3752,6 +3752,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4314,7 +4315,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6265,6 +6268,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6280,6 +6284,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8276,6 +8281,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8301,6 +8307,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8582,6 +8589,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8628,6 +8636,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -3749,6 +3749,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4184,6 +4185,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4310,7 +4312,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6259,6 +6263,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6274,6 +6279,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8269,6 +8275,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8294,6 +8301,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8575,6 +8583,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8621,6 +8630,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -3745,6 +3745,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4180,6 +4181,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4306,7 +4308,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6253,6 +6257,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6268,6 +6273,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8260,6 +8266,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8285,6 +8292,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8566,6 +8574,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8612,6 +8621,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -3759,6 +3759,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4325,7 +4326,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6287,6 +6290,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6302,6 +6306,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8305,6 +8310,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8330,6 +8336,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8612,6 +8619,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8658,6 +8666,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -3757,6 +3757,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4322,7 +4323,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6283,6 +6286,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6298,6 +6302,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8300,6 +8305,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8325,6 +8331,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8607,6 +8614,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8653,6 +8661,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -3756,6 +3756,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4321,7 +4322,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6282,6 +6285,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6297,6 +6301,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8298,6 +8303,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8323,6 +8329,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8604,6 +8611,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8650,6 +8658,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -3756,6 +3756,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4321,7 +4322,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6277,6 +6280,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6292,6 +6296,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8293,6 +8298,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8318,6 +8324,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8599,6 +8606,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8645,6 +8653,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -3754,6 +3754,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4318,7 +4319,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6273,6 +6276,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6288,6 +6292,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8288,6 +8293,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8313,6 +8319,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8594,6 +8601,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8640,6 +8648,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -3753,6 +3753,7 @@ self: super: {
  "gravatar" = doDistribute super."gravatar_0_6";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4317,7 +4318,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6272,6 +6275,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6287,6 +6291,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8287,6 +8292,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8312,6 +8318,7 @@ self: super: {
  "turtle" = dontDistribute super."turtle";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8593,6 +8600,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_8_7";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8639,6 +8647,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_2";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -3727,6 +3727,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4162,6 +4163,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4287,7 +4289,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6210,6 +6214,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6225,6 +6230,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8207,6 +8213,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8232,6 +8239,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8511,6 +8519,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8557,6 +8566,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -3726,6 +3726,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4161,6 +4162,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4286,7 +4288,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6209,6 +6213,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6224,6 +6229,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8206,6 +8212,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8231,6 +8238,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8510,6 +8518,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8555,6 +8564,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -3709,6 +3709,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4142,6 +4143,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4266,7 +4268,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6178,6 +6182,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6193,6 +6198,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8159,6 +8165,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8184,6 +8191,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8463,6 +8471,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8508,6 +8517,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8839,6 +8849,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -3707,6 +3707,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4139,6 +4140,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4263,7 +4265,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6172,6 +6176,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6187,6 +6192,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8150,6 +8156,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8175,6 +8182,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8454,6 +8462,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8499,6 +8508,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8830,6 +8840,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -3707,6 +3707,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4139,6 +4140,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4263,7 +4265,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6172,6 +6176,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6187,6 +6192,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8149,6 +8155,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8174,6 +8181,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8453,6 +8461,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8498,6 +8507,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8829,6 +8839,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -3707,6 +3707,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4138,6 +4139,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4262,7 +4264,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6170,6 +6174,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6185,6 +6190,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8147,6 +8153,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8172,6 +8179,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8451,6 +8459,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8496,6 +8505,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8827,6 +8837,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -3705,6 +3705,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4136,6 +4137,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4260,7 +4262,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6167,6 +6171,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6182,6 +6187,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8143,6 +8149,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8168,6 +8175,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8447,6 +8455,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8492,6 +8501,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8821,6 +8831,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@ -3704,6 +3704,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4135,6 +4136,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4259,7 +4261,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6165,6 +6169,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6180,6 +6185,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8140,6 +8146,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8165,6 +8172,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8444,6 +8452,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8489,6 +8498,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8818,6 +8828,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@ -3700,6 +3700,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4131,6 +4132,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4255,7 +4257,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6160,6 +6164,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6175,6 +6180,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8135,6 +8141,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8160,6 +8167,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8439,6 +8447,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8484,6 +8493,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8813,6 +8823,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@ -3344,6 +3344,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3695,6 +3696,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4126,6 +4128,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4250,7 +4253,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6154,6 +6159,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6169,6 +6175,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8129,6 +8136,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8154,6 +8162,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8433,6 +8442,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8478,6 +8488,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8807,6 +8818,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@ -3342,6 +3342,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3693,6 +3694,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4124,6 +4126,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4247,7 +4250,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6150,6 +6155,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6165,6 +6171,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8124,6 +8131,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8149,6 +8157,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8428,6 +8437,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8473,6 +8483,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8801,6 +8812,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@ -3341,6 +3341,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3692,6 +3693,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4123,6 +4125,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4246,7 +4249,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6148,6 +6153,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6163,6 +6169,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8120,6 +8127,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8145,6 +8153,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8424,6 +8433,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8469,6 +8479,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8796,6 +8807,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@ -3723,6 +3723,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4158,6 +4159,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4283,7 +4285,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6206,6 +6210,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6221,6 +6226,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8203,6 +8209,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8228,6 +8235,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8507,6 +8515,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8552,6 +8561,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@ -3340,6 +3340,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3691,6 +3692,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4122,6 +4124,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4245,7 +4248,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6147,6 +6152,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6162,6 +6168,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8117,6 +8124,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8142,6 +8150,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8421,6 +8430,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8466,6 +8476,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8793,6 +8804,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@ -3340,6 +3340,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3691,6 +3692,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4122,6 +4124,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4245,7 +4248,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6146,6 +6151,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6161,6 +6167,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8115,6 +8122,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8140,6 +8148,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8417,6 +8426,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8462,6 +8472,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8788,6 +8799,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@ -3340,6 +3340,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3691,6 +3692,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4122,6 +4124,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4244,7 +4247,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6144,6 +6149,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6159,6 +6165,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8113,6 +8120,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8138,6 +8146,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8415,6 +8424,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8460,6 +8470,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8786,6 +8797,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@ -3722,6 +3722,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4157,6 +4158,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4282,7 +4284,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6204,6 +6208,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6219,6 +6224,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8201,6 +8207,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8226,6 +8233,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8505,6 +8513,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8550,6 +8559,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@ -3721,6 +3721,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4156,6 +4157,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4281,7 +4283,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6202,6 +6206,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6217,6 +6222,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8197,6 +8203,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8222,6 +8229,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8501,6 +8509,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8546,6 +8555,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@ -3720,6 +3720,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4155,6 +4156,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4280,7 +4282,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6201,6 +6205,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6216,6 +6221,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8196,6 +8202,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8221,6 +8228,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8500,6 +8508,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8545,6 +8554,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@ -3717,6 +3717,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4150,6 +4151,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4275,7 +4277,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6195,6 +6199,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6210,6 +6215,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8188,6 +8194,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8213,6 +8220,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8492,6 +8500,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8537,6 +8546,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8869,6 +8879,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@ -3716,6 +3716,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4149,6 +4150,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4274,7 +4276,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6194,6 +6198,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6209,6 +6214,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8187,6 +8193,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8212,6 +8219,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8491,6 +8499,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8536,6 +8545,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8868,6 +8878,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@ -3714,6 +3714,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4147,6 +4148,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4272,7 +4274,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6192,6 +6196,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6207,6 +6212,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8181,6 +8187,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8206,6 +8213,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8485,6 +8493,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8530,6 +8539,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8862,6 +8872,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@ -3710,6 +3710,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4143,6 +4144,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4268,7 +4270,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -6184,6 +6188,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -6199,6 +6204,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -8168,6 +8174,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -8193,6 +8200,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_0_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8472,6 +8480,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_9";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8517,6 +8526,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_2_3";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8848,6 +8858,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@ -1657,6 +1657,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3252,6 +3253,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3600,6 +3602,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4024,6 +4027,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4143,7 +4147,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5891,6 +5897,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5977,6 +5984,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5992,6 +6000,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7906,6 +7915,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7930,6 +7940,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_1";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8201,6 +8212,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8246,6 +8258,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8563,6 +8576,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_2";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@ -1656,6 +1656,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3249,6 +3250,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3597,6 +3599,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -4021,6 +4024,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4140,7 +4144,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5886,6 +5892,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5972,6 +5979,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5987,6 +5995,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7899,6 +7908,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7923,6 +7933,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_1";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8193,6 +8204,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8238,6 +8250,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_3_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8555,6 +8568,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@ -1644,6 +1644,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3221,6 +3222,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3566,6 +3568,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3989,6 +3992,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4107,7 +4111,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5837,6 +5843,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5922,6 +5929,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5937,6 +5945,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7828,6 +7837,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7852,6 +7862,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8120,6 +8131,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8164,6 +8176,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8303,6 +8316,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8472,6 +8486,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@ -1644,6 +1644,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3219,6 +3220,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3564,6 +3566,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3987,6 +3990,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4105,7 +4109,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5835,6 +5841,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5920,6 +5927,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5935,6 +5943,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7824,6 +7833,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7848,6 +7858,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8116,6 +8127,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8160,6 +8172,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8299,6 +8312,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8468,6 +8482,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@ -1643,6 +1643,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3215,6 +3216,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3559,6 +3561,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3982,6 +3985,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4100,7 +4104,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5830,6 +5836,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5915,6 +5922,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5930,6 +5938,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7816,6 +7825,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7840,6 +7850,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8108,6 +8119,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8152,6 +8164,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8291,6 +8304,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8460,6 +8474,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@ -1643,6 +1643,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3215,6 +3216,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3559,6 +3561,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3982,6 +3985,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4099,7 +4103,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5828,6 +5834,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5913,6 +5920,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5928,6 +5936,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7813,6 +7822,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7837,6 +7847,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_2";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8105,6 +8116,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8149,6 +8161,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8287,6 +8300,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8456,6 +8470,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@ -1641,6 +1641,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3209,6 +3210,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3553,6 +3555,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3976,6 +3979,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4093,7 +4097,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5820,6 +5826,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5905,6 +5912,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5920,6 +5928,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7805,6 +7814,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7829,6 +7839,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_3";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8097,6 +8108,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8141,6 +8153,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8278,6 +8291,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8447,6 +8461,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@ -1641,6 +1641,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3209,6 +3210,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3221,6 +3223,7 @@ self: super: {
  "generic-tree" = dontDistribute super."generic-tree";
  "generic-trie" = dontDistribute super."generic-trie";
  "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
  "generics-eot" = dontDistribute super."generics-eot";
  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
  "genericserialize" = dontDistribute super."genericserialize";
@ -3552,6 +3555,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3974,6 +3978,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4091,7 +4096,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5816,6 +5823,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5901,6 +5909,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5916,6 +5925,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7800,6 +7810,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7824,6 +7835,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_3";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8092,6 +8104,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8136,6 +8149,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8273,6 +8287,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8442,6 +8457,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@ -1640,6 +1640,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3207,6 +3208,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3219,6 +3221,7 @@ self: super: {
  "generic-tree" = dontDistribute super."generic-tree";
  "generic-trie" = dontDistribute super."generic-trie";
  "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
  "generics-eot" = dontDistribute super."generics-eot";
  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
  "genericserialize" = dontDistribute super."genericserialize";
@ -3550,6 +3553,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3971,6 +3975,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4088,7 +4093,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5811,6 +5818,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5896,6 +5904,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5911,6 +5920,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7788,6 +7798,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7812,6 +7823,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_3";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8080,6 +8092,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8124,6 +8137,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8261,6 +8275,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8430,6 +8445,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@ -1639,6 +1639,7 @@ self: super: {
  "bitstring" = dontDistribute super."bitstring";
  "bittorrent" = dontDistribute super."bittorrent";
  "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
  "bk-tree" = dontDistribute super."bk-tree";
  "bkr" = dontDistribute super."bkr";
@ -3205,6 +3206,7 @@ self: super: {
  "generator" = dontDistribute super."generator";
  "generators" = dontDistribute super."generators";
  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
  "generic-binary" = dontDistribute super."generic-binary";
  "generic-church" = dontDistribute super."generic-church";
  "generic-deepseq" = dontDistribute super."generic-deepseq";
@ -3217,6 +3219,7 @@ self: super: {
  "generic-tree" = dontDistribute super."generic-tree";
  "generic-trie" = dontDistribute super."generic-trie";
  "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
  "generics-eot" = dontDistribute super."generics-eot";
  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
  "genericserialize" = dontDistribute super."genericserialize";
@ -3548,6 +3551,7 @@ self: super: {
  "grasp" = dontDistribute super."grasp";
  "gray-code" = dontDistribute super."gray-code";
  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
  "greencard" = dontDistribute super."greencard";
  "greencard-lib" = dontDistribute super."greencard-lib";
  "greg-client" = dontDistribute super."greg-client";
@ -3968,6 +3972,7 @@ self: super: {
  "hdph-closure" = dontDistribute super."hdph-closure";
  "hdr-histogram" = dontDistribute super."hdr-histogram";
  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
  "heaps" = doDistribute super."heaps_0_3_2_1";
  "heapsort" = dontDistribute super."heapsort";
  "hecc" = dontDistribute super."hecc";
@ -4085,7 +4090,9 @@ self: super: {
  "hint-server" = dontDistribute super."hint-server";
  "hinvaders" = dontDistribute super."hinvaders";
  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
  "hipe" = dontDistribute super."hipe";
  "hips" = dontDistribute super."hips";
  "hircules" = dontDistribute super."hircules";
@ -5805,6 +5812,7 @@ self: super: {
  "oberon0" = dontDistribute super."oberon0";
  "obj" = dontDistribute super."obj";
  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
  "observable-sharing" = dontDistribute super."observable-sharing";
  "octane" = dontDistribute super."octane";
  "octohat" = dontDistribute super."octohat";
@ -5890,6 +5898,7 @@ self: super: {
  "orchid-demo" = dontDistribute super."orchid-demo";
  "ord-adhoc" = dontDistribute super."ord-adhoc";
  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
  "order-statistics" = dontDistribute super."order-statistics";
  "ordered" = dontDistribute super."ordered";
  "orders" = dontDistribute super."orders";
@ -5905,6 +5914,7 @@ self: super: {
  "osx-ar" = dontDistribute super."osx-ar";
  "ot" = dontDistribute super."ot";
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
  "package-description-remote" = dontDistribute super."package-description-remote";
@ -7782,6 +7792,7 @@ self: super: {
  "tsession" = dontDistribute super."tsession";
  "tsession-happstack" = dontDistribute super."tsession-happstack";
  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
  "tslogger" = dontDistribute super."tslogger";
  "tsp-viz" = dontDistribute super."tsp-viz";
  "tsparse" = dontDistribute super."tsparse";
@ -7806,6 +7817,7 @@ self: super: {
  "turtle" = doDistribute super."turtle_1_2_3";
  "turtle-options" = dontDistribute super."turtle-options";
  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
  "twentefp" = dontDistribute super."twentefp";
  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
@ -8074,6 +8086,7 @@ self: super: {
  "vector-mmap" = dontDistribute super."vector-mmap";
  "vector-random" = dontDistribute super."vector-random";
  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
  "vector-space" = doDistribute super."vector-space_0_10_2";
  "vector-space-map" = dontDistribute super."vector-space-map";
  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@ -8118,6 +8131,7 @@ self: super: {
  "vty-ui" = dontDistribute super."vty-ui";
  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
  "waddle" = dontDistribute super."waddle";
  "wai" = doDistribute super."wai_3_0_4_0";
  "wai-accept-language" = dontDistribute super."wai-accept-language";
@ -8255,6 +8269,7 @@ self: super: {
  "winio" = dontDistribute super."winio";
  "wiring" = dontDistribute super."wiring";
  "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
  "witness" = dontDistribute super."witness";
  "witty" = dontDistribute super."witty";
  "wkt" = dontDistribute super."wkt";
@ -8424,6 +8439,7 @@ self: super: {
  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = doDistribute super."yesod-auth-oauth_1_4_0_2";
  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
--- a/Show More
+++ b/Show More