Merge branch 'master' into closure-size

2015-11-29 16:50:26 +01:00 · 2015-11-29 16:50:26 +01:00 · 920b1d3591
parent 07a0204282 a9056371a0
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@ -196,12 +196,12 @@ you need it.</para>

 <para>
  Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
-  <varname>python32</varname>, <varname>python33</varname>, <varname>python34</varname>
+  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
  and <varname>pypy</varname>.
 </para>

 <para>
-  <varname>python</varname> is an alias of <varname>python27</varname> and <varname>python3</varname> is an alias of <varname>python34</varname>.
+  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
 </para>

 <para>
@ -231,7 +231,7 @@ are provided with all modules included.</para>
 </para>

 <para>
- All packages depending on any Python interpreter get appended <varname>$out/${python.libPrefix}/site-packages</varname>
+ All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
 to <literal>$PYTHONPATH</literal> if such directory exists.
 </para>

@ -306,7 +306,7 @@ twisted = buildPythonPackage {
  Most of Python packages that use <varname>buildPythonPackage</varname> are defined
  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
  and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
-  <varname>python27Packages</varname>, <varname>python32Packages</varname>, <varname>python33Packages</varname>,
+  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
  <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
  </para>

@ -314,20 +314,14 @@ twisted = buildPythonPackage {
    <function>buildPythonPackage</function> mainly does four things:

    <orderedlist>
-      <listitem><para>
-        In the <varname>configurePhase</varname>, it patches
-        <literal>setup.py</literal> to always include setuptools before
-        distutils for monkeypatching machinery to take place.
-      </para></listitem>
-
      <listitem><para>
        In the <varname>buildPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py build ...</literal>
+        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
      </para></listitem>

      <listitem><para>
-        In the <varname>installPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py install ...</literal>
+        In the <varname>installPhase</varname>, it installs the wheel file using
+        <literal>pip install *.whl</literal>.
      </para></listitem>

      <listitem><para>
@ -336,11 +330,15 @@ twisted = buildPythonPackage {
        directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
        environment variables.
      </para></listitem>
+
+      <listitem><para>
+        In the <varname>installCheck</varname> phase, <literal>${python.interpreter} setup.py test</literal>
+        is ran.
+      </para></listitem>
    </orderedlist>
  </para>

-  <para>By default <varname>doCheck = true</varname> is set and tests are run with
-  <literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
+  <para>By default <varname>doCheck = true</varname> is set</para>

  <para>
    As in Perl, dependencies on other Python packages can be specified in the
@ -382,17 +380,10 @@ twisted = buildPythonPackage {
      </para></listitem>
    </varlistentry>

-    <varlistentry>
-      <term><varname>setupPyInstallFlags</varname></term>
-      <listitem><para>
-        List of flags passed to <command>setup.py install</command> command.
-      </para></listitem>
-    </varlistentry>
-
    <varlistentry>
      <term><varname>setupPyBuildFlags</varname></term>
      <listitem><para>
-        List of flags passed to <command>setup.py build</command> command.
+        List of flags passed to <command>setup.py build_ext</command> command.
      </para></listitem>
    </varlistentry>

@ -400,7 +391,7 @@ twisted = buildPythonPackage {
      <term><varname>pythonPath</varname></term>
      <listitem><para>
        List of packages to be added into <literal>$PYTHONPATH</literal>.
-        Packages in <varname>pythonPath</varname> are not propagated into user environment
+        Packages in <varname>pythonPath</varname> are not propagated
        (contrary to <varname>propagatedBuildInputs</varname>).
      </para></listitem>
    </varlistentry>
@ -419,15 +410,6 @@ twisted = buildPythonPackage {
      </para></listitem>
    </varlistentry>

-    <varlistentry>
-      <term><varname>distutilsExtraCfg</varname></term>
-      <listitem><para>
-        Extra lines passed to <varname>[easy_install]</varname> section of
-        <filename>distutils.cfg</filename> (acts as global setup.cfg
-        configuration).
-      </para></listitem>
-    </varlistentry>
-
    <varlistentry>
      <term><varname>makeWrapperArgs</varname></term>
      <listitem><para>
@ -545,7 +527,7 @@ exist in community to help save time. No tool is preferred at the moment.
  <para>
    To develop Python packages <function>buildPythonPackage</function> has
    additional logic inside <varname>shellPhase</varname> to run
-    <command>${python.interpreter} setup.py develop</command> for the package.
+    <command>pip install -e . --prefix $TMPDIR/</command> for the package.
  </para>

  <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -96,6 +96,7 @@
  enolan = "Echo Nolan <echo@echonolan.net>";
  epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
+  ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
  erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
  ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
  exlevan = "Alexey Levan <exlevan@gmail.com>";
@ -181,12 +182,14 @@
  malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
  manveru = "Michael Fellinger <m.fellinger@gmail.com>";
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  markWot = "Markus Wotringer <markus@wotringer.de";
  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
  matejc = "Matej Cotman <cotman.matej@gmail.com>";
  mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
  matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
  mbakke = "Marius Bakke <ymse@tuta.io>";
  mbe = "Brandon Edens <brandonedens@gmail.com>";
+  mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
  meditans = "Carlo Nucera <meditans@gmail.com>";
  meisternu = "Matt Miemiec <meister@krutt.org>";
  michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
@ -288,6 +291,7 @@
  theuni = "Christian Theune <ct@flyingcircus.io>";
  thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
  titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
+  tohl = "Tomas Hlavaty <tom@logand.com>";
  tokudan = "Daniel Frank <git@danielfrank.net>";
  tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
  travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@ -26,6 +26,13 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;

 </itemizedlist>

+<para>The following new services were added since the last release:
+
+  <itemizedlist>
+    <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
+  </itemizedlist>
+</para>
+
 <para>When upgrading from a previous release, please be aware of the
 following incompatible changes:</para>

@ -89,6 +96,14 @@ nginx.override {
    </para>
  </listitem>

+  <listitem>
+    <para><literal>tidy-html5</literal> package is removed.
+    Upstream only provided <literal>(lib)tidy5</literal> during development,
+    and now they went back to <literal>(lib)tidy</literal> to work as a drop-in
+    replacement of the original package that has been unmaintained for years.
+    You can (still) use the <literal>html-tidy</literal> package, which got updated
+    to a stable release from this new upstream.</para>
+  </listitem>
 </itemizedlist>

 </section>
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixos/lib/make-iso9660-image.sh
@ -119,7 +119,11 @@ $xorriso -output $out/iso/$isoName

 if test -n "$usbBootable"; then
    echo "Making image hybrid..."
-    isohybrid --uefi $out/iso/$isoName
+    if test -n "$efiBootable"; then
+        isohybrid --uefi $out/iso/$isoName
+    else
+        isohybrid $out/iso/$isoName
+    fi
 fi

 if test -n "$compressImage"; then
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -305,7 +305,7 @@
      nslcd = 58;
      scanner = 59;
      nginx = 60;
-      #chrony = 61; # unused
+      chrony = 61;
      systemd-journal = 62;
      smtpd = 63;
      smtpq = 64;
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@ -179,6 +179,8 @@ in
    environment.systemPackages = [ pkgs.zsh ]
      ++ optional cfg.enableCompletion pkgs.nix-zsh-completions;

+    environment.pathsToLink = optional cfg.enableCompletion "/share/zsh";
+
    #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";

    environment.shells =
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@ -218,7 +218,7 @@ let
      # Samba stuff to the Samba module.  This requires that the PAM
      # module provides the right hooks.
      text = mkDefault
-        ''
+        (''
          # Account management.
          account sufficient pam_unix.so
          ${optionalString config.users.ldap.enable
@ -241,12 +241,22 @@ let
              "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"}
          ${optionalString cfg.usbAuth
              "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+        '' +
+          # Modules in this block require having the password set in PAM_AUTHTOK.
+          # pam_unix is marked as 'sufficient' on NixOS which means nothing will run
+          # after it succeeds. Certain modules need to run after pam_unix
+          # prompts the user for password so we run it once with 'required' at an
+          # earlier point and it will run again with 'sufficient' further down.
+          # We use try_first_pass the second time to avoid prompting password twice
+          (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) ''
+              auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
+              ${optionalString config.security.pam.enableEcryptfs
+                "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
+              ${optionalString cfg.pamMount
+                "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
+            '') + ''
          ${optionalString cfg.unixAuth
-              "auth ${if (config.security.pam.enableEcryptfs || cfg.pamMount) then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"}
-          ${optionalString cfg.pamMount
-              "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
-          ${optionalString config.security.pam.enableEcryptfs
-              "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
+              "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
          ${optionalString cfg.otpwAuth
              "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
          ${optionalString cfg.oathAuth
@ -258,7 +268,7 @@ let
            auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
            auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass
          ''}
-          ${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"}
+          auth required pam_deny.so

          # Password management.
          password requisite pam_unix.so nullok sha512
@ -306,7 +316,7 @@ let
              "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
          ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
              "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
-        '';
+        '');
    };

  };
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@ -121,6 +121,7 @@ in
      disnix =
        { description = "Disnix server";
        
+          wants = [ "dysnomia.target" ];
          wantedBy = [ "multi-user.target" ];
          after = [ "dbus.service" ]
            ++ optional config.services.httpd.enable "httpd.service"
@ -137,6 +138,17 @@ in
          environment = {
            HOME = "/root";
          };
+          
+          preStart = ''
+            mkdir -p /etc/systemd-mutable/system
+            if [ ! -f /etc/systemd-mutable/system/dysnomia.target ]
+            then
+                ( echo "[Unit]"
+                  echo "Description=Services that are activated and deactivated by Dysnomia"
+                  echo "After=final.target"
+                ) > /etc/systemd-mutable/system/dysnomia.target
+            fi
+          '';

          exec = "disnix-service";
        };
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@ -41,8 +41,15 @@ let
  };

  carbonOpts = name: with config.ids; ''
-    --nodaemon --syslog --prefix=${name} --pidfile ${dataDir}/${name}.pid ${name}
+    --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name}
  '';
+
+  mkPidFileDir = name: ''
+    mkdir -p /run/${name}
+    chmod 0700 /run/${name}
+    chown -R graphite:graphite /run/${name}
+  '';
+
  carbonEnv = {
    PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages";
    GRAPHITE_ROOT = dataDir;
@ -370,18 +377,20 @@ in {

  config = mkMerge [
    (mkIf cfg.carbon.enableCache {
-      systemd.services.carbonCache = {
+      systemd.services.carbonCache = let name = "carbon-cache"; in {
        description = "Graphite Data Storage Backend";
        wantedBy = [ "multi-user.target" ];
        after = [ "network-interfaces.target" ];
        environment = carbonEnv;
        serviceConfig = {
-          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
+          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}";
          User = "graphite";
          Group = "graphite";
          PermissionsStartOnly = true;
+          PIDFile="/run/${name}/${name}.pid";
        };
-        preStart = ''
+        preStart = mkPidFileDir name + ''
+
          mkdir -p ${cfg.dataDir}/whisper
          chmod 0700 ${cfg.dataDir}/whisper
          chown -R graphite:graphite ${cfg.dataDir}
@ -390,31 +399,35 @@ in {
    })

    (mkIf cfg.carbon.enableAggregator {
-      systemd.services.carbonAggregator = {
+      systemd.services.carbonAggregator = let name = "carbon-aggregator"; in {
        enable = cfg.carbon.enableAggregator;
        description = "Carbon Data Aggregator";
        wantedBy = [ "multi-user.target" ];
        after = [ "network-interfaces.target" ];
        environment = carbonEnv;
        serviceConfig = {
-          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}";
+          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}";
          User = "graphite";
          Group = "graphite";
+          PIDFile="/run/${name}/${name}.pid";
        };
+        preStart = mkPidFileDir name;
      };
    })

    (mkIf cfg.carbon.enableRelay {
-      systemd.services.carbonRelay = {
+      systemd.services.carbonRelay = let name = "carbon-relay"; in {
        description = "Carbon Data Relay";
        wantedBy = [ "multi-user.target" ];
        after = [ "network-interfaces.target" ];
        environment = carbonEnv;
        serviceConfig = {
-          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}";
+          ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}";
          User = "graphite";
          Group = "graphite";
+          PIDFile="/run/${name}/${name}.pid";
        };
+        preStart = mkPidFileDir name;
      };
    })

--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@ -6,13 +6,21 @@ let

  cfg = config.services.statsd;

+  isBuiltinBackend = name:
+    builtins.elem name [ "graphite" "console" "repeater" ];
+
  configFile = pkgs.writeText "statsd.conf" ''
    {
      address: "${cfg.host}",
      port: "${toString cfg.port}",
      mgmt_address: "${cfg.mgmt_address}",
      mgmt_port: "${toString cfg.mgmt_port}",
-      backends: [${concatMapStringsSep "," (el: if (nixType el) == "string" then ''"./backends/${el}"'' else ''"${head el.names}"'') cfg.backends}],
+      backends: [${
+        concatMapStringsSep "," (name:
+          if (isBuiltinBackend name)
+          then ''"./backends/${name}"''
+          else ''"${name}"''
+        ) cfg.backends}],
      ${optionalString (cfg.graphiteHost!=null) ''graphiteHost: "${cfg.graphiteHost}",''}
      ${optionalString (cfg.graphitePort!=null) ''graphitePort: "${toString cfg.graphitePort}",''}
      console: {
@ -66,9 +74,16 @@ in

    backends = mkOption {
      description = "List of backends statsd will use for data persistence";
-      default = ["graphite"];
-      example = ["graphite" pkgs.nodePackages."statsd-influxdb-backend"];
-      type = types.listOf (types.either types.str types.package);
+      default = [];
+      example = [
+        "graphite"
+        "console"
+        "repeater"
+        "statsd-librato-backend"
+        "stackdriver-statsd-backend"
+        "statsd-influxdb-backend"
+      ];
+      type = types.listOf types.str;
    };

    graphiteHost = mkOption {
@ -105,15 +120,17 @@ in
      description = "Statsd Server";
      wantedBy = [ "multi-user.target" ];
      environment = {
-        NODE_PATH=concatMapStringsSep ":" (el: "${el}/lib/node_modules") (filter (el: (nixType el) != "string") cfg.backends);
+        NODE_PATH=concatMapStringsSep ":"
+          (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
+          (filter (name: !isBuiltinBackend name) cfg.backends);
      };
      serviceConfig = {
-        ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}";
+        ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";
        User = "statsd";
      };
    };

-    environment.systemPackages = [pkgs.nodePackages.statsd];
+    environment.systemPackages = [ pkgs.statsd ];

  };

--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@ -8,26 +8,10 @@ let

  stateDir = "/var/lib/chrony";

-  chronyUser = "chrony";
+  keyFile = "/etc/chrony.keys";

  cfg = config.services.chrony;

-  configFile = pkgs.writeText "chrony.conf" ''
-    ${toString (map (server: "server " + server + "\n") cfg.servers)}
-
-    ${optionalString cfg.initstepslew.enabled ''
-      initstepslew ${toString cfg.initstepslew.threshold} ${toString (map (server: server + " ") cfg.initstepslew.servers)}
-    ''}
-
-    driftfile ${stateDir}/chrony.drift
-
-    ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
-
-    ${cfg.extraConfig}
-  '';
-
-  chronyFlags = "-m -f ${configFile} -u ${chronyUser}";
-
 in

 {
@ -47,12 +31,7 @@ in
      };

      servers = mkOption {
-        default = [
-          "0.nixos.pool.ntp.org"
-          "1.nixos.pool.ntp.org"
-          "2.nixos.pool.ntp.org"
-          "3.nixos.pool.ntp.org"
-        ];
+        default = config.services.ntp.servers;
        description = ''
          The set of NTP servers from which to synchronise.
        '';
@ -90,28 +69,60 @@ in
    # Make chronyc available in the system path
    environment.systemPackages = [ pkgs.chrony ];

+    environment.etc."chrony.conf".text =
+      ''
+        ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
+
+        ${optionalString
+          cfg.initstepslew.enabled
+          "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
+        }
+
+        driftfile ${stateDir}/chrony.drift
+
+        keyfile ${keyFile}
+        generatecommandkey
+
+        ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
+
+        ${cfg.extraConfig}
+      '';
+
+    users.extraGroups = singleton
+      { name = "chrony";
+        gid = config.ids.gids.chrony;
+      };
+
    users.extraUsers = singleton
-      { name = chronyUser;
+      { name = "chrony";
        uid = config.ids.uids.chrony;
+        group = "chrony";
        description = "chrony daemon user";
        home = stateDir;
      };

-    jobs.chronyd =
-      { description = "chrony daemon";
+    systemd.services.ntpd.enable = false;
+
+    systemd.services.chronyd =
+      { description = "chrony NTP daemon";

        wantedBy = [ "multi-user.target" ];
        after = [ "network.target" ];
+        conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];

-        path = [ chrony ];
+        path = [ pkgs.chrony ];

        preStart =
          ''
            mkdir -m 0755 -p ${stateDir}
-            chown ${chronyUser} ${stateDir}
+            touch ${keyFile}
+            chmod 0640 ${keyFile}
+            chown chrony:chrony ${stateDir} ${keyFile}
          '';

-        exec = "chronyd -n ${chronyFlags}";
+        serviceConfig =
+          { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony";
+          };
      };

  };
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@ -21,7 +21,7 @@ in
        description = ''
          Whether to enable the Syncthing, self-hosted open-source alternative
          to Dropbox and BittorrentSync. Initial interface will be
-          available on http://127.0.0.1:8080/.
+          available on http://127.0.0.1:8384/.
        '';
      };

@ -40,6 +40,17 @@ in
        '';
      };

+      package = mkOption {
+        type = types.package;
+        default = pkgs.syncthing;
+        example = literalExample "pkgs.syncthing";
+        description = ''
+          Syncthing package to use.
+        '';
+      };
+
+
+
    };

  };
@ -66,7 +77,7 @@ in
        };
      };

-    environment.systemPackages = [ pkgs.syncthing ];
+    environment.systemPackages = [ cfg.package ];

  };

--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@ -248,7 +248,7 @@ in
    if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then
      echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'."
      # Wait until MySQL is up
-      while [ ! -e /var/run/mysql/mysqld.pid ]; do
+      while [ ! -e ${serverInfo.fullConfig.services.mysql.pidDir}/mysqld.pid ]; do
        sleep 1
      done
      ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@ -30,7 +30,7 @@ let
      label = mkOption {
        default = null;
        example = "rootfs";
-        type = types.uniq (types.nullOr types.str);
+        type = types.nullOr types.str;
        description = "Label of the unlocked encrypted device. Set <literal>fileSystems.&lt;name?&gt;.device</literal> to <literal>/dev/mapper/&lt;label&gt;</literal> to mount the unlocked device.";
      };

--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@ -47,6 +47,41 @@ let

  system = config.nixpkgs.system;

+  bindMountOpts = { name, config, ... }: {
+  
+    options = {
+      mountPoint = mkOption {
+        example = "/mnt/usb";
+        type = types.str;
+        description = "Mount point on the container file system.";
+      };
+      hostPath = mkOption {
+        default = null;
+        example = "/home/alice";
+        type = types.nullOr types.str;
+        description = "Location of the host path to be mounted.";
+      };
+      isReadOnly = mkOption {
+        default = true;
+        example = true;
+        type = types.bool;
+        description = "Determine whether the mounted path will be accessed in read-only mode.";
+      };
+    };
+    
+    config = {
+      mountPoint = mkDefault name;
+    };
+    
+  };
+  
+  mkBindFlag = d:
+               let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind=";
+                   mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}";
+               in flagPrefix + mountstr ;
+
+  mkBindFlags = bs: concatMapStrings mkBindFlag (lib.attrValues bs);
+
 in

 {
@ -142,6 +177,21 @@ in
                Wether the container is automatically started at boot-time.
              '';
            };
+
+            bindMounts = mkOption {
+              type = types.loaOf types.optionSet;
+              options = [ bindMountOpts ];
+              default = {};
+              example = { "/home" = { hostPath = "/home/alice";
+                                      isReadOnly = false; };
+                        };
+                        
+              description =
+                ''
+                  An extra list of directories that is bound to the container.
+                '';
+            };
+
          };

          config = mkMerge
@ -249,12 +299,15 @@ in
              fi
            ''}

+
+
            # Run systemd-nspawn without startup notification (we'll
            # wait for the container systemd to signal readiness).
            EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \
            exec ${config.systemd.package}/bin/systemd-nspawn \
              --keep-unit \
              -M "$INSTANCE" -D "$root" $extraFlags \
+              $EXTRA_NSPAWN_FLAGS \
              --bind-ro=/nix/store \
              --bind-ro=/nix/var/nix/db \
              --bind-ro=/nix/var/nix/daemon-socket \
@ -354,6 +407,7 @@ in
           ${optionalString cfg.autoStart ''
             AUTO_START=1
           ''}
+           EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}"
          '';
      }) config.containers;

--- a/pkgs/applications/audio/faust/default.nix
+++ b/pkgs/applications/audio/faust/default.nix
@ -1,20 +1,26 @@
 { stdenv
 , coreutils
-, fetchgit
+, fetchurl
 , makeWrapper
 , pkgconfig
+, clang
+, llvm
+, emscripten
+, openssl
+, libsndfile
+, libmicrohttpd
+, vim
 }:

 with stdenv.lib.strings;

 let

-  version = "8-1-2015";
+  version = "2.0-a41";

-  src = fetchgit {
-    url = git://git.code.sf.net/p/faudiostream/code;
-    rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
-    sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/faudiostream/faust-2.0.a41.tgz";
+    sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm";
  };

  meta = with stdenv.lib; {
@ -31,19 +37,22 @@ let

    inherit src;

-    buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper llvm emscripten openssl libsndfile pkgconfig libmicrohttpd vim ];
+

    passthru = {
      inherit wrap wrapWithBuildEnv;
    };

+
    preConfigure = ''
-      makeFlags="$makeFlags prefix=$out"
+      makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world"

      # The faust makefiles use 'system ?= $(shell uname -s)' but nix
      # defines 'system' env var, so undefine that so faust detects the
      # correct system.
      unset system
+      sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix
    '';

    # Remove most faust2appl scripts since they won't run properly
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@ -0,0 +1,209 @@
+{ stdenv
+, coreutils
+, fetchgit
+, makeWrapper
+, pkgconfig
+}:
+
+with stdenv.lib.strings;
+
+let
+
+  version = "8-1-2015";
+
+  src = fetchgit {
+    url = git://git.code.sf.net/p/faudiostream/code;
+    rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
+    sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://faust.grame.fr/;
+    downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ magnetophon pmahoney ];
+  };
+
+  faust = stdenv.mkDerivation {
+
+    name = "faust-${version}";
+
+    inherit src;
+
+    buildInputs = [ makeWrapper ];
+
+    passthru = {
+      inherit wrap wrapWithBuildEnv;
+    };
+
+    preConfigure = ''
+      makeFlags="$makeFlags prefix=$out"
+
+      # The faust makefiles use 'system ?= $(shell uname -s)' but nix
+      # defines 'system' env var, so undefine that so faust detects the
+      # correct system.
+      unset system
+    '';
+
+    # Remove most faust2appl scripts since they won't run properly
+    # without additional paths setup. See faust.wrap,
+    # faust.wrapWithBuildEnv.
+    postInstall = ''
+      # syntax error when eval'd directly
+      pattern="faust2!(svg)"
+      (shopt -s extglob; rm "$out"/bin/$pattern)
+    '';
+
+    postFixup = ''
+      # Set faustpath explicitly.
+      substituteInPlace "$out"/bin/faustpath \
+        --replace "/usr/local /usr /opt /opt/local" "$out"
+
+      # The 'faustoptflags' is 'source'd into other faust scripts and
+      # not used as an executable, so patch 'uname' usage directly
+      # rather than use makeWrapper.
+      substituteInPlace "$out"/bin/faustoptflags \
+        --replace uname "${coreutils}/bin/uname"
+
+      # wrapper for scripts that don't need faust.wrap*
+      for script in "$out"/bin/faust2*; do
+        wrapProgram "$script" \
+          --prefix PATH : "$out"/bin
+      done
+    '';
+
+    meta = meta // {
+      description = "A functional programming language for realtime audio signal processing";
+      longDescription = ''
+        FAUST (Functional Audio Stream) is a functional programming
+        language specifically designed for real-time signal processing
+        and synthesis. FAUST targets high-performance signal processing
+        applications and audio plug-ins for a variety of platforms and
+        standards.
+        The Faust compiler translates DSP specifications into very
+        efficient C++ code. Thanks to the notion of architecture,
+        FAUST programs can be easily deployed on a large variety of
+        audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
+        puredata, csound, supercollider, pure, vst, coreaudio) without
+        any change to the FAUST code.
+
+        This package has just the compiler, libraries, and headers.
+        Install faust2* for specific faust2appl scripts.
+      '';
+    };
+
+  };
+
+  # Default values for faust2appl.
+  faust2ApplBase =
+    { baseName
+    , dir ? "tools/faust2appls"
+    , scripts ? [ baseName ]
+    , ...
+    }@args:
+
+    args // {
+      name = "${baseName}-${version}";
+
+      inherit src;
+
+      configurePhase = ":";
+
+      buildPhase = ":";
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p "$out/bin"
+        for script in ${concatStringsSep " " scripts}; do
+          cp "${dir}/$script" "$out/bin/"
+        done
+
+        runHook postInstall
+      '';
+
+      postInstall = ''
+        # For the faust2appl script, change 'faustpath' and
+        # 'faustoptflags' to absolute paths.
+        for script in "$out"/bin/*; do
+          substituteInPlace "$script" \
+            --replace ". faustpath" ". '${faust}/bin/faustpath'" \
+            --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'"
+        done
+      '';
+
+      meta = meta // {
+        description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
+      };
+    };
+
+  # Some 'faust2appl' scripts, such as faust2alsa, run faust to
+  # generate cpp code, then invoke the c++ compiler to build the code.
+  # This builder wraps these scripts in parts of the stdenv such that
+  # when the scripts are called outside any nix build, they behave as
+  # if they were running inside a nix build in terms of compilers and
+  # paths being configured (e.g. rpath is set so that compiled
+  # binaries link to the libs inside the nix store)
+  #
+  # The function takes two main args: the appl name (e.g.
+  # 'faust2alsa') and an optional list of propagatedBuildInputs. It
+  # returns a derivation that contains only the bin/${appl} script,
+  # wrapped up so that it will run as if it was inside a nix build
+  # with those build inputs.
+  #
+  # The build input 'faust' is automatically added to the
+  # propagatedBuildInputs.
+  wrapWithBuildEnv =
+    { baseName
+    , propagatedBuildInputs ? [ ]
+    , ...
+    }@args:
+
+    stdenv.mkDerivation ((faust2ApplBase args) // {
+
+      buildInputs = [ makeWrapper pkgconfig ];
+
+      propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
+
+      postFixup = ''
+
+        # export parts of the build environment
+        for script in "$out"/bin/*; do
+          wrapProgram "$script" \
+            --set FAUST_LIB_PATH "${faust}/lib/faust" \
+            --prefix PATH : "$PATH" \
+            --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
+            --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \
+            --set NIX_LDFLAGS "\"$NIX_LDFLAGS\""
+        done
+      '';
+    });
+
+  # Builder for 'faust2appl' scripts, such as faust2firefox that
+  # simply need to be wrapped with some dependencies on PATH.
+  #
+  # The build input 'faust' is automatically added to the PATH.
+  wrap =
+    { baseName
+    , runtimeInputs ? [ ]
+    , ...
+    }@args:
+
+    let
+
+      runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
+
+    in stdenv.mkDerivation ((faust2ApplBase args) // {
+
+      buildInputs = [ makeWrapper ];
+
+      postFixup = ''
+        for script in "$out"/bin/*; do
+          wrapProgram "$script" --prefix PATH : "${runtimePath}"
+        done
+      '';
+
+    });
+
+in faust
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@ -15,7 +15,7 @@ in buildPythonPackage rec {
  };

  buildInputs = [
-    coverage feedparser minimock sqlite3 mygpoclient intltool
+    coverage minimock sqlite3 mygpoclient intltool
    gnome3.gnome_themes_standard gnome3.defaultIconTheme
    gnome3.gsettings_desktop_schemas
  ];
@ -27,8 +27,6 @@ in buildPythonPackage rec {

  postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile";

-  checkPhase = "make unittest";
-
  preFixup = ''
    wrapProgram $out/bin/gpodder \
      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
@ -40,17 +38,6 @@ in buildPythonPackage rec {
  postFixup = ''
    wrapPythonPrograms

-    if test -e $out/nix-support/propagated-build-inputs; then
-        ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-    fi
-
-    createBuildInputsPth build-inputs "$buildInputStrings"
-    for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
-      if test -e $out/nix-support/$inputsfile; then
-          createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
-      fi
-    done
-
    sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{
        /import sys; sys.argv/d
    }'
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ groff ];
  buildInputs = [ id3lib zlib ];

-  makeFlags = "PREFIX=$(out)";
-  buildFlags = "clean all";
+  makeFlags = [ "PREFIX=$(out)" ];
+  buildFlags = [ "clean" "all" ];

  preInstall = ''
    mkdir -p $out/{bin,share/man/man1}
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ libav libkeyfinder ];

-  makeFlagsArray = "PREFIX=$(out)";
+  makeFlags = [ "PREFIX=$(out)" ];

  enableParallelBuilding = true;

--- a/pkgs/applications/audio/mopidy-mopify/default.nix
+++ b/pkgs/applications/audio/mopidy-mopify/default.nix
@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec {
    sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as";
  };

-  propagatedBuildInputs = [ mopidy ];
+  propagatedBuildInputs = with pythonPackages; [ mopidy configobj ];

  doCheck = false;

--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@ -335,16 +335,16 @@ rec {

  testng = buildEclipsePlugin rec {
    name = "testng-${version}";
-    version = "6.9.8.201510130443";
+    version = "6.9.10.201511281504";

    srcFeature = fetchurl {
      url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar";
-      sha256 = "0g0dva1zpqk0rz0vgr025g2cfc47snr857fsqcrssmp9qmy8x0i0";
+      sha256 = "1kjaifa1fc16yh82bzp5xa5pn3kgrpgc5jq55lyvgz29vjj6ss97";
    };

    srcPlugin = fetchurl {
      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar";
-      sha256 = "16mnvqkakixqp3bcnyx6x2iwkhnv3k4q561c97kssz98xsrr8f54";
+      sha256 = "1njz4ynjwnhjjbsszfgqyjn2ixxzjv8qvnc7dqz8jldrz3jrjf07";
    };

    meta = with stdenv.lib; {
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@ -1,9 +1,9 @@
 { stdenv, pythonPackages, fetchgit }:
+
 pythonPackages.buildPythonPackage rec {
  name = "leo-editor-${version}";
-  version = "5.1";
-
  namePrefix = "";
+  version = "5.1";

  src = fetchgit {
    url = "https://github.com/leo-editor/leo-editor";
@ -13,6 +13,11 @@ pythonPackages.buildPythonPackage rec {

  propagatedBuildInputs = with pythonPackages; [ pyqt4 sqlite3 ];

+
+  patchPhase = ''
+    rm setup.cfg
+  '';
+
  meta = {
    homepage = "http://leoeditor.com";
    description = "A powerful folding editor";
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qt5 }:

-let version = "7.0"; in
+let version = "7.1"; in
 stdenv.mkDerivation {
  name = "apitrace-${version}";

  src = fetchFromGitHub {
-    sha256 = "0nn3z7i6cd4zkmms6jpp1v2q194gclbs06v0f5hyiwcsqaxzsg5b";
+    sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a";
    rev = version;
    repo = "apitrace";
    owner = "apitrace";
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@ -1,36 +1,36 @@
-{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, lxml, pil, fbida, which }:
+{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2,  pythonPackages, fbida, which }:

-buildPythonPackage {
-  name = "jbrout-338";
+buildPythonPackage rec {
+  name = "jbrout-${version}";
  version = "338";
+
  src = fetchsvn {
    url = "http://jbrout.googlecode.com/svn/trunk";
-    rev = "338";
+    rev = version;
    sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf";
  };

  doCheck = false;
-# XXX: preConfigure to avoid this
-#  File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader
-#    len(filename), len(extra))
-#struct.error: ushort format requires 0 <= number <= USHRT_MAX

-  preConfigure = ''
+  # XXX: patchPhase to avoid this
+  #  File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader
+  #    len(filename), len(extra))
+  #struct.error: ushort format requires 0 <= number <= USHRT_MAX
+  patchPhase = ''
    find | xargs touch
+
+    substituteInPlace setup.py --replace "version=__version__" "version=baseVersion"
  '';

  postInstall = ''
-    mkdir -p $out/bin
-    echo '#!/bin/sh' > $out/bin/jbrout
-    echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout
+    mkdir $out/bin
+    echo "python $out/${python.sitePackages}/jbrout/jbrout.py" > $out/bin/jbrout
    chmod +x $out/bin/jbrout
-
-    wrapProgram $out/bin/jbrout \
-            --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pyexiv2}):$(toPythonPath ${lxml}):$(toPythonPath ${pil}):$PYTHONPATH" \
-            --set PATH "${fbida}/bin:${which}/bin:$PATH"
  '';

-  buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ];
+  buildInputs = [ python makeWrapper which ];
+  propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ];
+
  meta = {
    homepage = "http://code.google.com/p/jbrout";
    description = "Photo manager";
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -5,11 +5,12 @@
 }:

 stdenv.mkDerivation rec {
-  name = "calibre-${meta.version}";
+  version = "2.45.0";
+  name = "calibre-${version}";

  src = fetchurl {
-    url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz";
-    sha256 = "1ffqvnjqmplcpa398809gp4d4l7nqc6k8ky255mdkabfcdvf3kk3";
+    url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
+    sha256 = "1s3wrrvp2d0mczs09g2xkkknvlk3max6ws7awpss5kkdpjvay6ma";
  };

  inherit python;
@ -58,11 +59,11 @@ stdenv.mkDerivation rec {
  '';

  meta = with stdenv.lib; {
-    version = "2.44.1";
    description = "Comprehensive e-book software";
    homepage = http://calibre-ebook.com;
    license = licenses.gpl3;
    maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ];
    platforms = platforms.linux;
+    inherit version;
  };
 }
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
  configureFlags = [ "--with-zlib=system" ]
    # Floating point behavior on i686 causes test failures. Preventing
    # extended precision fixes this problem.
-    ++ stdenv.lib.optional stdenv.isi686 "CXXFLAGS=-ffloat-store";
+    ++ stdenv.lib.optionals stdenv.isi686 [
+      "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store"
+    ];

  enableParallelBuilding = true;

@ -32,7 +34,11 @@ stdenv.mkDerivation rec {
    patchShebangs testo
    substituteInPlace testo \
      --replace "-x /usr/bin/hexdump" ""
-  '';
+  '' + (
+    # The raymarine and gtm tests fail on i686 despite -ffloat-store.
+    if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
+    else ""
+  );

  meta = with stdenv.lib; {
    description = "Convert, upload and download data from GPS and Map programs";
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@ -32,14 +32,15 @@ pythonPackages.buildPythonPackage {
    matplotlib beautifulsoup4 pygtk lxml ];

  enableParallelBuilding = true;
-  
+
  preConfigure = with stdenv.lib; ''
-    ${concatStrings (map (x: "ln -s ${x.src} models/`basename ${x.name}`;")
+    ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;")
      models)}

    substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out
  '';

+  doCheck = false;  # fails
  checkPhase = ''
    patchShebangs .
    substituteInPlace ./run-test \
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@ -16,10 +16,10 @@ python27Packages.buildPythonPackage rec {

  doCheck = false;

+  setupPyBuildFlags = ["-i"];
+
  postPatch = ''
    sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py
-    sed -i "s|distutils.core|setuptools|" setup.py
-    sed -i "s|distutils.command.install |setuptools.command.install |" setup.py
  '';

  postInstall = ''
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@ -27,12 +27,12 @@ pythonPackages.buildPythonPackage rec {
  # string, which allows setting an explicit MIME type.
  patches = [ ./pytrainer-webkit.patch ];

-  pythonPath = with pythonPackages; [
+  propagatedBuildInputs = with pythonPackages; [
    dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk
-    sqlalchemy sqlalchemy_migrate
+    sqlalchemy_migrate
  ];

-  buildInputs = [gpsbabel sqlite] ++ pythonPath;
+  buildInputs = [ gpsbabel sqlite ];

  # This package contains no binaries to patch or strip.
  dontPatchELF = true;
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgs }:
+
+stdenv.mkDerivation rec {
+    version = "2.0";
+    name = "weather-${version}";
+
+    src = fetchurl {
+        url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
+        sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0";
+    };
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    installPhase = ''
+        mkdir $out/{share,man,bin} -p
+        cp weather{,.py} $out/bin/
+        cp {airports,overrides.{conf,log},places,slist,stations,weatherrc,zctas,zlist,zones} $out/share/
+        chmod +x $out/bin/weather
+        cp ./weather.1 $out/man/
+        cp ./weatherrc.5 $out/man/
+    '';
+
+    meta = {
+        homepage = "http://fungi.yuggoth.org/weather";
+        description = "Quick access to current weather conditions and forecasts";
+        license = stdenv.lib.licenses.isc;
+        maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+        platforms = with stdenv.lib.platforms; linux; # my only platform
+    };
+}
--- a/pkgs/applications/misc/ykpers/default.nix
+++ b/pkgs/applications/misc/ykpers/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec
 {
-  version = "1.15.0";
+  version = "1.17.2";
  name = "ykpers-${version}";

  src = fetchurl
  {
    url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
-    sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+    sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh";
  };

  buildInputs = [pkgconfig libusb1 libyubikey];
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@ -1,6 +1,6 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
 , automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
-, setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion
+, setuptools, boto, pythonProtobuf, apr, subversion
 , leveldb, glog, perf, utillinux, libnl, iproute
 }:

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
  dontDisableStatic = true;

  src = fetchurl {
-    url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz";
+    url = "http://archive.apache.org/dist/mesos/${version}/${name}.tar.gz";
    sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
  };

@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {

  buildInputs = [
    makeWrapper autoconf automake114x libtool curl sasl jdk maven
-    python wrapPython boto distutils-cfg setuptools leveldb
+    python wrapPython boto setuptools leveldb
    subversion apr glog
  ] ++ lib.optionals stdenv.isLinux [
    libnl
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "davmail-4.6.1";
+  name = "davmail-4.7.0";
  src = fetchurl {
-    url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.6.1-2343.tgz";
-    sha256 = "15kpbrmw9pcifxj4k4m3q0azbl95kfgwvgb8bc9aj00q0yi3wgiq";
+    url = "mirror://sourceforge/davmail/4.7.0/davmail-linux-x86_64-4.7.0-2408.tgz";
+    sha256 = "1kasnqnvw8icm32m5vbvkpx5im1w4sifiaafb08rw4a1zn8asxv1";
  };

  buildInputs = [ makeWrapper ];
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    substituteInPlace Makefile --replace -liconv_hook ""
  '';

-  makeFlags = "prefix=$(out)";
+  makeFlags = [ "prefix=$(out)" ];
  enableParallelBuilding = true;

  doCheck = true;
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@ -30,7 +30,7 @@

 with stdenv.lib;

-let version = "3.12.0"; in
+let version = "3.13.0"; in

 stdenv.mkDerivation {
  name = "claws-mail-${version}";
@ -40,12 +40,12 @@ stdenv.mkDerivation {
    homepage = http://www.claws-mail.org/;
    license = licenses.gpl3;
    platforms = platforms.linux;
-    maintainers = [ maintainers.khumba ];
+    maintainers = with maintainers; [ khumba fpletz ];
  };

  src = fetchurl {
    url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "1jnnwivpcplv8x4w0ibb1qcnasl37fr53lbfybhgb936l2mdcai7";
+    sha256 = "0fpr9gdgrs5yggm61a6135ca06x0cflddsh8dwfqmpb3dj07cl1n";
  };

  patches = [ ./mime.patch ];
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@ -12,12 +12,6 @@ buildPythonPackage rec {
    sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r";
  };

-  # Sometimes the generated output isn't identical. It seems like there's a
-  # race condtion while patching the Mailnag/commons/dist_cfg.py file. This is
-  # a small workaround to produce deterministic builds.
-  # For more information see https://github.com/NixOS/nixpkgs/pull/8279
-  setupPyBuildFlags = [ "--build-base=$PWD" ];
-
  buildInputs = [
    gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus
    pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;

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

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

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

  buildInputs = [
@ -70,6 +70,6 @@ stdenv.mkDerivation {
    '';

    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor ];
+    maintainers = with stdenv.lib.maintainers; [ simons bjornfor fpletz ];
  };
 }
--- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
+++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
@ -1,6 +1,6 @@
-From 188e8858243b2278239261aaaaea7ad07476d561 Mon Sep 17 00:00:00 2001
+From 5bef9deeff8a2e4401de0f45c9701cd6f98f29d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
-Date: Sun, 13 Apr 2014 15:17:24 +0200
+Date: Thu, 26 Nov 2015 21:03:35 +0100
 Subject: [PATCH] Lookup dumpcap in PATH

 NixOS patch: Look for dumpcap in PATH first, because there may be a
@ -10,20 +10,21 @@ non-setuid dumpcap binary.
 Also change execv() to execvp() because we've set argv[0] to "dumpcap"
 and have to enable PATH lookup. Wireshark is not a setuid program, so
 looking in PATH is not a security issue.
---
- capture_sync.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)

-diff --git a/capture_sync.c b/capture_sync.c
-index eb05fae..efb5675 100644
--- a/capture_sync.c
-+++ b/capture_sync.c
-@@ -326,8 +326,18 @@ init_pipe_args(int *argc) {
-     argv = (char **)g_malloc(sizeof (char *));
-     *argv = NULL;
- 
-    /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */
-    exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir);
+Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
+---
+ capchild/capture_sync.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
+index 970688e..49914d5 100644
+--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
+@@ -332,7 +332,18 @@ init_pipe_args(int *argc) {
+ #ifdef _WIN32
+     exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir);
+ #else
+-    exename = g_strdup_printf("%s/dumpcap", progfile_dir);
 +    /*
 +     * NixOS patch: Look for dumpcap in PATH first, because there may be a
 +     * dumpcap setuid-wrapper that we want to use instead of the default
@ -34,12 +35,12 @@ index eb05fae..efb5675 100644
 +        exename = g_strdup_printf("dumpcap");
 +    } else {
 +        /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */
-+        exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir);
+        exename = g_strdup_printf("%s/dumpcap", progfile_dir);
 +    }
+ #endif
 
     /* Make that the first argument in the argument list (argv[0]). */
-     argv = sync_pipe_add_arg(argv, argc, exename);
-@@ -649,7 +659,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
+@@ -729,7 +740,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
          */
         dup2(sync_pipe[PIPE_WRITE], 2);
         ws_close(sync_pipe[PIPE_READ]);
@ -48,7 +49,7 @@ index eb05fae..efb5675 100644
         g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
                    argv[0], g_strerror(errno));
         sync_pipe_errmsg_to_parent(2, errmsg, "");
-@@ -879,7 +889,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
+@@ -997,7 +1008,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
         dup2(sync_pipe[PIPE_WRITE], 2);
         ws_close(sync_pipe[PIPE_READ]);
         ws_close(sync_pipe[PIPE_WRITE]);
@ -58,5 +59,5 @@ index eb05fae..efb5675 100644
                    argv[0], g_strerror(errno));
         sync_pipe_errmsg_to_parent(2, errmsg, "");
 -- 
-1.9.0
+2.6.3

--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@ -11,89 +11,25 @@ buildPythonPackage rec {
  name = "zim-${version}";
  version = "0.63";
  namePrefix = "";
-  
+
  src = fetchurl {
    url = "http://zim-wiki.org/downloads/${name}.tar.gz";
    sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m";
  };

-  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];
+  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ];

  preBuild = ''
    mkdir -p /tmp/home
    export HOME="/tmp/home"
-  '';
-  
-  setupPyInstallFlags = ["--skip-xdg-cmd"];
-  
-  #
-  # Exactly identical to buildPythonPackage's version but for the
-  # `--old-and-unmanagable`, which I removed. This was removed because
-  # this is a setuptools specific flag and as zim is overriding 
-  # the install step, setuptools could not perform its monkey
-  # patching trick for the command. Alternate solutions were to
-  #
-  #  -  Remove the custom install step (tested as working but
-  #	also remove the possibility of performing the xdg-cmd
-  #     stuff).
-  #  -  Explicitly replace distutils import(s) by their setuptools
-  #	equivalent (untested). 
-  #
-  # Both solutions were judged unsatisfactory as altering the code
-  # would be required.
-  #
-  # Note that a improved solution would be to expose the use of 
-  # the `--old-and-unmanagable` flag as an option of passed to the
-  # buildPythonPackage function.
-  #
-  # Also note that I stripped all comments.
-  #
-  installPhase = ''
-    runHook preInstall

-    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
-
-    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-
-    ${python}/bin/${python.executable} setup.py install \
-      --install-lib=$out/lib/${python.libPrefix}/site-packages \
-      --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
-
-    eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
-    if [ -e "$eapth" ]; then
-	# move colliding easy_install.pth to specifically named one
-	mv "$eapth" $(dirname "$eapth")/${name}.pth
-    fi
-
-    rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
-
-    runHook postInstall
+    sed -i '/zim_install_class,/d' setup.py
  '';

-  # FIXME: this is quick and dirty hack, because zim expects the
-  # path to the executable in argv[0] therefore the wrapper is
-  # modified accordingly.
-  postFixup = ''
-    wrapProgram "$out/bin/zim" \
-      --prefix XDG_DATA_DIRS : "$out/share"

-    wrapPythonPrograms
-
-    sed -i "s#sys\.argv\[0\] = '.zim-wrapped'#sys.argv[0] = '$out/bin/zim'#g" \
-      $out/bin/..zim-wrapped-wrapped
-
-    if test -e $out/nix-support/propagated-build-inputs; then
-        ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-    fi
-
-    createBuildInputsPth build-inputs "$buildInputStrings"
-    for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
-      if test -e $out/nix-support/$inputsfile; then
-          createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
-      fi
-    done
+  preFixup = ''
+    export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
  '';
-  
  # Testing fails.
  doCheck = false;

--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@ -6,7 +6,7 @@
 {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:

 let
-  version = "8.5b3";
+  version = "8.5b2";
  coq-version = "8.5";
  buildIde = lablgtk != null;
  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@ -23,8 +23,8 @@ stdenv.mkDerivation {
  inherit ocaml camlp5;

  src = fetchurl {
-    url = https://coq.inria.fr/distrib/V8.5beta3/files/coq-8.5beta3.tar.gz;
-    sha256 = "12nnvfz5rsz660j4knhfhfbwq49y2va0rgfrxyiyrr1q4ic84wn6";
+    url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz;
+    sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v";
  };

  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
--- a/pkgs/applications/science/logic/sad/default.nix
+++ b/pkgs/applications/science/logic/sad/default.nix
@ -0,0 +1,33 @@
+{ stdenv, fetchurl, ghc, spass }:
+
+stdenv.mkDerivation {
+  name = "system-for-automated-deduction-2.3.25";
+  src = fetchurl {
+    url = "http://nevidal.org/download/sad-2.3-25.tar.gz";
+    sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
+  };
+  buildInputs = [ ghc spass ];
+  patches = [ ./patch ];
+  postPatch = ''
+    substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
+    '';
+  installPhase = ''
+    mkdir -p $out/{bin,provers}
+    install alice $out/bin
+    install provers/moses $out/provers
+    substituteAll provers/provers.dat $out/provers/provers.dat
+    substituteAll init.opt $out/init.opt
+    cp -r examples $out
+    '';
+  inherit spass;
+  meta = {
+    description = "A program for automated proving of mathematical texts";
+    longDescription = ''
+      The system for automated deduction is intended for automated processing of formal mathematical texts 
+      written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
+      '';
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.schmitthenner ];
+    homepage = http://nevidal.org/sad.en.html;
+  };  
+}
--- a/pkgs/applications/science/logic/sad/patch
+++ b/pkgs/applications/science/logic/sad/patch
@ -0,0 +1,200 @@
+diff -aur serious/sad-2.3-25/Alice/Core/Base.hs sad-2.3-25/Alice/Core/Base.hs
+--- serious/sad-2.3-25/Alice/Core/Base.hs	2008-03-29 18:24:12.000000000 +0000
+++ sad-2.3-25/Alice/Core/Base.hs	2015-11-27 06:38:28.740840823 +0000
+@@ -21,6 +21,7 @@
+ module Alice.Core.Base where
+ 
+ import Control.Monad
+import Control.Applicative
+ import Data.IORef
+ import Data.List
+ import Data.Time
+@@ -61,10 +62,21 @@
+ type CRMC a b = IORef RState -> IO a -> (b -> IO a) -> IO a
+ newtype CRM b = CRM { runCRM :: forall a . CRMC a b }
+ 
+instance Functor CRM where
+  fmap = liftM
+  
+instance Applicative CRM where
+  pure = return
+  (<*>) = ap
+
+ instance Monad CRM where
+   return r  = CRM $ \ _ _ k -> k r
+   m >>= n   = CRM $ \ s z k -> runCRM m s z (\ r -> runCRM (n r) s z k)
+ 
+instance Alternative CRM where
+  (<|>) = mplus
+  empty = mzero
+  
+ instance MonadPlus CRM where
+   mzero     = CRM $ \ _ z _ -> z
+   mplus m n = CRM $ \ s z k -> runCRM m s (runCRM n s z k) k
+diff -aur serious/sad-2.3-25/Alice/Core/Thesis.hs sad-2.3-25/Alice/Core/Thesis.hs
+--- serious/sad-2.3-25/Alice/Core/Thesis.hs	2008-03-05 13:10:50.000000000 +0000
+++ sad-2.3-25/Alice/Core/Thesis.hs	2015-11-27 06:35:08.311015166 +0000
+@@ -21,6 +21,7 @@
+ module Alice.Core.Thesis (thesis) where
+ 
+ import Control.Monad
+import Control.Applicative
+ import Data.List
+ import Data.Maybe
+ 
+@@ -126,11 +127,22 @@
+ 
+ newtype TM res = TM { runTM :: [String] -> [([String], res)] }
+ 
+instance Functor TM where
+  fmap = liftM
+
+instance Applicative TM where
+  pure = return
+  (<*>) = ap
+
+ instance Monad TM where
+   return r  = TM $ \ s -> [(s, r)]
+   m >>= k   = TM $ \ s -> concatMap apply (runTM m s)
+     where apply (s, r) = runTM (k r) s
+ 
+instance Alternative TM where
+  (<|>) = mplus
+  empty = mzero
+    
+ instance MonadPlus TM where
+   mzero     = TM $ \ _ -> []
+   mplus m k = TM $ \ s -> runTM m s ++ runTM k s
+diff -aur serious/sad-2.3-25/Alice/Export/Base.hs sad-2.3-25/Alice/Export/Base.hs
+--- serious/sad-2.3-25/Alice/Export/Base.hs	2008-03-09 09:36:39.000000000 +0000
+++ sad-2.3-25/Alice/Export/Base.hs	2015-11-27 06:32:47.782738005 +0000
+@@ -39,7 +39,7 @@
+ -- Database reader
+ 
+ readPrDB :: String -> IO [Prover]
+-readPrDB file = do  inp <- catch (readFile file) $ die . ioeGetErrorString
+readPrDB file = do  inp <- catchIOError (readFile file) $ die . ioeGetErrorString
+ 
+                     let dws = dropWhile isSpace
+                         cln = reverse . dws . reverse . dws
+diff -aur serious/sad-2.3-25/Alice/Export/Prover.hs sad-2.3-25/Alice/Export/Prover.hs
+--- serious/sad-2.3-25/Alice/Export/Prover.hs	2008-03-09 09:36:39.000000000 +0000
+++ sad-2.3-25/Alice/Export/Prover.hs	2015-11-27 06:36:47.632919161 +0000
+@@ -60,7 +60,7 @@
+       when (askIB IBPdmp False ins) $ putStrLn tsk
+ 
+       seq (length tsk) $ return $
+-        do  (wh,rh,eh,ph) <- catch run
+        do  (wh,rh,eh,ph) <- catchIOError run
+                 $ \ e -> die $ "run error: " ++ ioeGetErrorString e
+ 
+             hPutStrLn wh tsk ; hClose wh
+diff -aur serious/sad-2.3-25/Alice/ForTheL/Base.hs sad-2.3-25/Alice/ForTheL/Base.hs
+--- serious/sad-2.3-25/Alice/ForTheL/Base.hs	2008-03-09 09:36:39.000000000 +0000
+++ sad-2.3-25/Alice/ForTheL/Base.hs	2015-11-27 06:31:51.921230428 +0000
+@@ -226,7 +226,7 @@
+ varlist = do  vs <- chainEx (char ',') var
+               nodups vs ; return vs
+ 
+-nodups vs = unless (null $ dups vs) $
+nodups vs = unless ((null :: [a] -> Bool) $ dups vs) $
+               fail $ "duplicate names: " ++ show vs
+ 
+ hidden  = askPS psOffs >>= \ n -> return ('h':show n)
+diff -aur serious/sad-2.3-25/Alice/Import/Reader.hs sad-2.3-25/Alice/Import/Reader.hs
+--- serious/sad-2.3-25/Alice/Import/Reader.hs	2008-03-09 09:36:39.000000000 +0000
+++ sad-2.3-25/Alice/Import/Reader.hs	2015-11-27 06:36:41.818866167 +0000
+@@ -24,7 +24,7 @@
+ import Control.Monad
+ import System.IO
+ import System.IO.Error
+-import System.Exit
+import System.Exit hiding (die)
+ 
+ import Alice.Data.Text
+ import Alice.Data.Instr
+@@ -44,7 +44,7 @@
+ readInit ""   = return []
+ 
+ readInit file =
+-  do  input <- catch (readFile file) $ die file . ioeGetErrorString
+  do  input <- catchIOError (readFile file) $ die file . ioeGetErrorString
+       let tkn = tokenize input ; ips = initPS ()
+           inp = ips { psRest = tkn, psFile = file, psLang = "Init" }
+       liftM fst $ fireLPM instf inp
+@@ -74,7 +74,7 @@
+ reader lb fs (ps:ss) [TI (InStr ISfile file)] =
+   do  let gfl = if null file  then hGetContents stdin
+                               else readFile file
+-      input <- catch gfl $ die file . ioeGetErrorString
+      input <- catchIOError gfl $ die file . ioeGetErrorString
+       let tkn = tokenize input
+           ips = initPS $ (psProp ps) { tvr_expr = [] }
+           sps = ips { psRest = tkn, psFile = file, psOffs = psOffs ps }
+diff -aur serious/sad-2.3-25/Alice/Parser/Base.hs sad-2.3-25/Alice/Parser/Base.hs
+--- serious/sad-2.3-25/Alice/Parser/Base.hs	2008-03-09 09:36:40.000000000 +0000
+++ sad-2.3-25/Alice/Parser/Base.hs	2015-11-27 06:14:28.616734527 +0000
+@@ -20,6 +20,7 @@
+ 
+ module Alice.Parser.Base where
+ 
+import Control.Applicative
+ import Control.Monad
+ import Data.List
+ 
+@@ -45,11 +46,22 @@
+ type CPMC a b c = (c -> CPMS a b) -> (String -> CPMS a b) -> CPMS a b
+ newtype CPM a c = CPM { runCPM :: forall b . CPMC a b c }
+ 
+instance Functor (CPM a) where
+  fmap = liftM
+
+instance Applicative (CPM a) where
+  pure = return
+  (<*>) = ap
+
+ instance Monad (CPM a) where
+   return r  = CPM $ \ k _ -> k r
+   m >>= n   = CPM $ \ k l -> runCPM m (\ b -> runCPM (n b) k l) l
+   fail e    = CPM $ \ _ l -> l e
+ 
+instance Alternative (CPM a) where
+    (<|>) = mplus
+    empty = mzero
+  
+ instance MonadPlus (CPM a) where
+   mzero     = CPM $ \ _ _ _ z -> z
+   mplus m n = CPM $ \ k l s -> runCPM m k l s . runCPM n k l s
+diff -aur serious/sad-2.3-25/init.opt sad-2.3-25/init.opt
+--- serious/sad-2.3-25/init.opt	2007-10-11 15:25:45.000000000 +0000
+++ sad-2.3-25/init.opt	2015-11-27 07:23:41.372816854 +0000
+@@ -1,6 +1,6 @@
+ # Alice init options
+-[library examples]
+-[provers provers/provers.dat]
+[library @out@/examples]
+[provers @out@/provers/provers.dat]
+ [prover spass]
+ [timelimit 3]
+ [depthlimit 7]
+diff -aur serious/sad-2.3-25/provers/provers.dat sad-2.3-25/provers/provers.dat
+--- serious/sad-2.3-25/provers/provers.dat	2008-08-26 21:20:25.000000000 +0000
+++ sad-2.3-25/provers/provers.dat	2015-11-27 07:24:18.878169702 +0000
+@@ -3,7 +3,7 @@
+ Pmoses
+ LMoses
+ Fmoses
+-Cprovers/moses
+C@out@/provers/moses
+ Yproved in
+ Nfound unprovable in
+ Utimeout in
+@@ -12,7 +12,7 @@
+ Pspass
+ LSPASS
+ Fdfg
+-Cprovers/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
+C@spass@/bin/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
+ YSPASS beiseite: Proof found.
+ NSPASS beiseite: Completion found.
+ USPASS beiseite: Ran out of time.
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@ -9,26 +9,21 @@

 buildPythonPackage rec {
  name = "spyder-${version}";
-  version = "2.3.6";
+  version = "2.3.7";
  namePrefix = "";

  src = fetchurl {
    url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip";
-    sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2";
+    sha256 = "0ywgvgcp9s64ys25nfscd2648f7di8544a21b5lb59d4f48z028h";
  };

-  buildInputs = [ unzip ];
+  # NOTE: sphinx makes the build fail with: ValueError: ZIP does not support timestamps before 1980
  propagatedBuildInputs =
-    [ pyside pyflakes rope sphinx numpy scipy matplotlib ipython pylint pep8 ];
+    [ pyside pyflakes rope  numpy scipy matplotlib ipython pylint pep8 ];

  # There is no test for spyder
  doCheck = false;

-  # Use setuptools instead of distutils.
-  preConfigure = ''
-    export USE_SETUPTOOLS=True
-  '';
-
  desktopItem = makeDesktopItem {
    name = "Spyder";
    exec = "spyder";
@ -41,11 +36,9 @@ buildPythonPackage rec {

  # Create desktop item
  postInstall = ''
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications/
-
-    mkdir -p $out/share/icons
-    cp spyderlib/images/spyder.svg $out/share/icons/
+    mkdir -p $out/share/{applications,icons}
+    cp  $desktopItem/share/applications/* $out/share/applications/
+    cp  spyderlib/images/spyder.svg $out/share/icons/
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  installFlags = "prefix=$(out)";
+  installFlags = [ "prefix=$(out)" ];

  postInstall = ''
    # Remove inert ftdetect vim plugin and a README that's a man page subset:
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@ -14,11 +14,10 @@ in buildPythonPackage rec {

  buildInputs = [ ffmpeg ];

-  pythonPath = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ];
+  propagatedBuildInputs = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ];

  postPatch = ''
    substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede"
-
  '';

  meta = with stdenv.lib; {
@ -26,5 +25,6 @@ in buildPythonPackage rec {
    homepage = http://www.rastersoft.com/programas/devede.html;
    license = licenses.gpl3;
    maintainers = [ maintainers.bdimcheff ];
+    broken = true;  # tarball is gone
  };
 }
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@ -18,40 +18,26 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs =
-    [ eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
+    [ eventlet greenlet gflags netaddr carrot routes
+      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7
      distutils_extra simplejson readline glance cheetah lockfile httplib2
      urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
-      libvirt libxml2Python ipaddr vte libosinfo
+      libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
+      gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
+      wrapGAppsHook
    ] ++ optional spiceSupport spice_gtk;

-  buildInputs =
-    [ mox
-      intltool
-      gtkvnc
-      gtk3
-      libvirt-glib
-      avahi
-      glib
-      gobjectIntrospection
-      gsettings_desktop_schemas
-      gnome3.defaultIconTheme
-      wrapGAppsHook
-      dconf
-    ];
+  buildInputs = [ dconf avahi intltool ];

  patchPhase = ''
    sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
+    sed -i "/'install_egg_info'/d" setup.py
  '';

-  configurePhase = ''
-    sed -i 's/from distutils.core/from setuptools/g' setup.py
-    sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py
-    python setup.py configure --prefix=$out
+  postConfigure = ''
+    ${python.interpreter} setup.py configure --prefix=$out
  '';

-  buildPhase = "true";
-
  postInstall = ''
    ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
  '';
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "A stand-alone panel";
    maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
  };

  passthru = {
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Stand alone tray";
    maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
  };

  passthru = {
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit;
 stdenv.mkDerivation {
  inherit name;
  builder = ./builder.sh;
-  fetcher = ./nix-prefetch-git;
+  fetcher = "${stdenv.shell} ${./nix-prefetch-git}";
  buildInputs = [git];

  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@ -1,4 +1,6 @@
-#! /bin/sh -e
+#! /usr/bin/env bash
+
+set -e -o pipefail

 url=
 rev=
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
  };

-  makeFlags = "MANDIR=$(out)/share/man";
+  makeFlags = [ "MANDIR=$(out)/share/man" ];

  meta = with stdenv.lib; {
    inherit version;
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:

 stdenv.mkDerivation rec {
-  name = "font-awesome-4.4.0";
+  name = "font-awesome-4.5.0";

  src = fetchurl {
    url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "1k7ff71pcp2qrnqj4yzrjg96m7yma9r58wdk68sqb93q2kq9fp3i";
+    sha256 = "1lvxs4isrk80cczq6nrxksvqxs04k13i23i6c2l5vmfs2ndjsdm2";
  };

  buildCommand = ''
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@ -2,6 +2,11 @@
 , nepomuk_core, nepomuk_widgets, libXt }:

 kde {
+  postPatch = ''
+    substituteInPlace konq-plugins/validators/tidy_validator.cpp \
+      --replace buffio.h tidybuffio.h
+  '';
+
  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];

  meta = {
--- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
@ -4,6 +4,11 @@ kde {

 # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old

+  postPatch = ''
+    substituteInPlace klinkstatus/src/tidy/tidyx.h \
+      --replace buffio.h tidybuffio.h
+  '';
+
  buildInputs = [ kdelibs kdepimlibs html-tidy boost ];

  meta = {
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name    = "ats2-${version}";
-  version = "0.1.12";
+  version = "0.2.4";

  src = fetchurl {
    url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "1jiki88mzhki74xh5ffw3pali5zs74pa0nylcb8n4ypfvdpqvlhb";
+    sha256 = "0dx3r2vxmarj3aqm0xlcmls1h08pll9y9k4820df41awyrwmfvcy";
  };

  buildInputs = [ gmp ];
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Clozure Common Lisp";
    homepage    = http://ccl.clozure.com/;
-    maintainers = with maintainers; [ raskin muflax ];
+    maintainers = with maintainers; [ raskin muflax tohl ];
    platforms   = attrNames options;
    license     = licenses.lgpl21;
  };
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@ -37,5 +37,6 @@ stdenv.mkDerivation {
    '';
    license = stdenv.lib.licenses.free;		# public domain
    homepage = http://www.cons.org/cmucl/;
+    maintainers = [stdenv.lib.maintainers.tohl];
  };
 }
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Embedded Qt Lisp (ECL+Qt)";
    maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
    license = licenses.mit;
  };

--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@ -40,7 +40,7 @@
 , ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit; }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
 }:
-let version = "0.1.0"; in
+let version = "0.2.0"; in
 mkDerivation (rec {
  pname = "ghcjs";
  inherit version;
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@ -0,0 +1,55 @@
+{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages}:
+
+# TODO: patch LLVM so Knights Landing works better (patch included in ispc github)
+
+stdenv.mkDerivation rec {
+  version = "20151128";
+  rev = "d3020580ff18836de2d4cae18901980b551d9d01";
+
+  name = "ispc-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ispc";
+    repo = "ispc";
+    inherit rev;
+    sha256 = "15qi22qvmlx3jrhrf3rwl0y77v66prpan6qb66a55dw3pw2d4jvn";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  buildInputs = with llvmPackages; [
+    which
+    m4
+    python
+    bison
+    flex
+    llvm
+    clang
+  ];
+
+  patchPhase = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ispc $out/bin
+  '';
+
+  checkPhase = ''
+    export ISPC_HOME=$PWD
+    python run_tests.py
+  '';
+
+  makeFlags = [
+    "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include"
+    ];
+
+  meta = with stdenv.lib; {
+    homepage = https://ispc.github.io/ ;
+    description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.aristid ];
+  };
+}
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
    homepage = https://common-lisp.net/project/mkcl/;
    license = stdenv.lib.licenses.lgpl2Plus;
    platforms = stdenv.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.tohl];
  };
 }

--- a/pkgs/development/compilers/ocaml/4.02.nix
+++ b/pkgs/development/compilers/ocaml/4.02.nix
@ -9,10 +9,6 @@ assert useX11 -> !stdenv.isArm && !stdenv.isMips;
 let
   useNativeCompilers = !stdenv.isMips;
   inherit (stdenv.lib) optionals optionalString;
-   patchOcamlBuild = fetchurl {
-     url = https://github.com/ocaml/ocaml/pull/117.patch;
-     sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0";
-   };
 in

 stdenv.mkDerivation rec {
@ -28,7 +24,7 @@ stdenv.mkDerivation rec {
    sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";
  };

-  patches = [ patchOcamlBuild ];
+  patches = [ ./ocamlbuild.patch ];

  prefixKey = "-prefix ";
  configureFlags = optionals useX11 [ "-x11lib" x11lib
--- a/pkgs/development/compilers/ocaml/ocamlbuild.patch
+++ b/pkgs/development/compilers/ocaml/ocamlbuild.patch
@ -0,0 +1,45 @@
+Author: Vincent Laporte <Vincent.Laporte@gmail.com>
+Date:   Sun Feb 1 11:19:50 2015 +0100
+
+    ocamlbuild: use ocamlfind to discover camlp4 path
+    
+    and default to `+camlp4`
+
+diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml
+index b902810..a73b7a5 100644
+--- a/ocamlbuild/ocaml_specific.ml
+++ b/ocamlbuild/ocaml_specific.ml
+@@ -698,15 +698,25 @@ ocaml_lib ~extern:true ~tag_name:"use_toplevel" "toplevellib";;
+ ocaml_lib ~extern:true ~dir:"+ocamldoc" "ocamldoc";;
+ ocaml_lib ~extern:true ~dir:"+ocamlbuild" ~tag_name:"use_ocamlbuild" "ocamlbuildlib";;
+ 
+-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4" "camlp4lib";;
+-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_old_camlp4" "camlp4";;
+-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4_full" "camlp4fulllib";;
+let camlp4dir =
+  Findlib.(
+    try
+      if sys_command "sh -c 'ocamlfind list >/dev/null' 2>/dev/null" != 0
+      then raise (Findlib_error Cannot_run_ocamlfind);
+      (query "camlp4").location
+    with Findlib_error _ ->
+      "+camlp4"
+  );;
+
+ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4" "camlp4lib";;
+ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_old_camlp4" "camlp4";;
+ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4_full" "camlp4fulllib";;
+ flag ["ocaml"; "compile"; "use_camlp4_full"]
+-     (S[A"-I"; A"+camlp4/Camlp4Parsers";
+-        A"-I"; A"+camlp4/Camlp4Printers";
+-        A"-I"; A"+camlp4/Camlp4Filters"]);;
+-flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A"+camlp4/Camlp4Bin.cmo");;
+-flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A"+camlp4/Camlp4Bin.cmx");;
+     (S[A"-I"; A(camlp4dir^"/Camlp4Parsers");
+        A"-I"; A(camlp4dir^"/Camlp4Printers");
+        A"-I"; A(camlp4dir^"/Camlp4Filters")]);;
+flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A(camlp4dir^"/Camlp4Bin.cmo"));;
+flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A(camlp4dir^"/Camlp4Bin.cmx"));;
+ 
+ flag ["ocaml"; "debug"; "compile"; "byte"] (A "-g");;
+ flag ["ocaml"; "debug"; "link"; "byte"; "program"] (A "-g");;
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    description = "Lisp compiler";
    homepage = "http://www.sbcl.org";
    license = licenses.publicDomain; # and FreeBSD
-    maintainers = [maintainers.raskin];
+    maintainers = [maintainers.raskin maintainers.tohl];
    platforms = attrNames options;
  };
 }
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }:
+{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" }:

 stdenv.mkDerivation rec {
  name    = "sbcl-${version}";
@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
    sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
  };

-  buildInputs = [ which ];
-
  patchPhase = ''
    echo '"${version}.nixos"' > version.lisp-expr
    echo "
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'

    # Fix software version retrieval
-    sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
+    sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp

    # Fix the tests
    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -924,4 +924,13 @@ self: super: {
    librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
  });

+  # https://github.com/fpco/stackage/issues/1004
+  gtk2hs-buildtools = super.gtk2hs-buildtools.override { alex = self.alex_3_1_4; };
+
+  # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32
+  morte = super.morte.override { alex = self.alex_3_1_4; };
+
+  # https://github.com/mainland/language-c-quote/issues/57
+  language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
+
 }
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@ -118,9 +118,6 @@ self: super: {
  # Version 1.19.5 fails its test suite.
  happy = dontCheck super.happy;

-  # Test suite fails in "/tokens_bytestring_unicode.g.bin".
-  alex = dontCheck super.alex;
-
  # Upstream was notified about the over-specified constraint on 'base'
  # but refused to do anything about it because he "doesn't want to
  # support a moving target". Go figure.
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@ -55,8 +55,6 @@ self: super: {
  nats = dontHaddock super.nats;
  bytestring-builder = dontHaddock super.bytestring-builder;

-  alex = dontCheck super.alex;
-
  # We have time 1.5
  aeson = disableCabalFlag super.aeson "old-locale";

--- a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
@ -44,8 +44,6 @@ self: super: {
  nats = dontHaddock super.nats;
  bytestring-builder = dontHaddock super.bytestring-builder;

-  alex = dontCheck super.alex;
-
  # We have time 1.5
  aeson = disableCabalFlag super.aeson "old-locale";

--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -250,6 +250,7 @@ dont-distribute-packages:
  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  ApplePush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -481,6 +482,7 @@ dont-distribute-packages:
  buffer-builder-aeson:                         [ i686-linux ]
  buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  buffer-builder:                               [ i686-linux ]
+  buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -998,6 +1000,7 @@ dont-distribute-packages:
  easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  ed25519:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  edenmodules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1032,6 +1035,7 @@ dont-distribute-packages:
  emgm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  Emping:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  Encode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  enumfun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1092,6 +1096,7 @@ dont-distribute-packages:
  FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  farmhash:                                     [ x86_64-darwin ]
  fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  fast-builder:                                 [ x86_64-darwin ]
@ -1122,6 +1127,7 @@ dont-distribute-packages:
  file-location:                                [ x86_64-darwin ]
  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  file-modules:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1267,6 +1273,7 @@ dont-distribute-packages:
  geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  geoip2:                                       [ i686-linux ]
  GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  geom2d:                                       [ i686-linux ]
  GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1595,6 +1602,7 @@ dont-distribute-packages:
  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskell-tyrant:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1605,8 +1613,10 @@ dont-distribute-packages:
  haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskoin-crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-node:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskoin-protocol:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskoin-script:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskoin-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1829,6 +1839,7 @@ dont-distribute-packages:
  hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1944,6 +1955,7 @@ dont-distribute-packages:
  HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2015,6 +2027,7 @@ dont-distribute-packages:
  hTensor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  HTicTacToe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  html-entities:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  html-rules:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  htoml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  htsn-import:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  http-client-request-modifiers:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2231,6 +2244,7 @@ dont-distribute-packages:
  keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-hails-reactive-wx:                      [ x86_64-darwin ]
  keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2336,6 +2350,7 @@ dont-distribute-packages:
  libcspm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  libexpect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libgraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  liblinear-enumerator:                         [ x86_64-darwin ]
@ -2506,6 +2521,7 @@ dont-distribute-packages:
  mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meep:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3451,6 +3467,7 @@ dont-distribute-packages:
  stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  starrover2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3528,6 +3545,7 @@ dont-distribute-packages:
  system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  system-time-monotonic:                        [ x86_64-darwin ]
+  tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3599,6 +3617,7 @@ dont-distribute-packages:
  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  tianbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  tickle:                                       [ i686-linux ]
+  tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  tidal-midi:                                   [ x86_64-darwin ]
@ -3770,6 +3789,7 @@ dont-distribute-packages:
  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  vacuum-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2559,6 +2560,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2995,6 +2997,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3077,6 +3080,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4779,6 +4783,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5107,6 +5112,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5496,6 +5502,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5571,6 +5578,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6094,6 +6102,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6138,6 +6147,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6916,6 +6926,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7477,6 +7488,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7749,6 +7761,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2558,6 +2559,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2994,6 +2996,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3076,6 +3079,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4778,6 +4782,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5106,6 +5111,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5495,6 +5501,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5570,6 +5577,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6093,6 +6101,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6137,6 +6146,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6915,6 +6925,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7476,6 +7487,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7748,6 +7760,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2558,6 +2559,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2994,6 +2996,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3076,6 +3079,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4778,6 +4782,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5106,6 +5111,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5495,6 +5501,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5570,6 +5577,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6093,6 +6101,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6137,6 +6146,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6915,6 +6925,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7476,6 +7487,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7748,6 +7760,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2558,6 +2559,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2994,6 +2996,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3076,6 +3079,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4778,6 +4782,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5106,6 +5111,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5495,6 +5501,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5570,6 +5577,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6093,6 +6101,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6137,6 +6146,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6915,6 +6925,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7476,6 +7487,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7748,6 +7760,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2557,6 +2558,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2993,6 +2995,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3075,6 +3078,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4775,6 +4779,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5103,6 +5108,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5492,6 +5498,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5567,6 +5574,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6090,6 +6098,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6134,6 +6143,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6911,6 +6921,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7472,6 +7483,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7743,6 +7755,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -1599,6 +1599,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2557,6 +2558,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2993,6 +2995,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3075,6 +3078,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4775,6 +4779,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5103,6 +5108,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5492,6 +5498,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5567,6 +5574,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6090,6 +6098,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6134,6 +6143,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6911,6 +6921,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7472,6 +7483,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7743,6 +7755,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -1596,6 +1596,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2554,6 +2555,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2990,6 +2992,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3072,6 +3075,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4771,6 +4775,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5099,6 +5104,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5488,6 +5494,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5563,6 +5570,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6085,6 +6093,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6129,6 +6138,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6905,6 +6915,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7466,6 +7477,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7737,6 +7749,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -1596,6 +1596,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2554,6 +2555,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2990,6 +2992,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3072,6 +3075,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4771,6 +4775,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5099,6 +5104,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5488,6 +5494,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5563,6 +5570,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6085,6 +6093,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6129,6 +6138,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6905,6 +6915,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7466,6 +7477,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = dontDistribute super."stackage";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7737,6 +7749,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -1591,6 +1591,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2545,6 +2546,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2980,6 +2982,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3062,6 +3065,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4759,6 +4763,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5087,6 +5092,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5476,6 +5482,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5551,6 +5558,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6073,6 +6081,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6116,6 +6125,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_7";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6890,6 +6900,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7450,6 +7461,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7721,6 +7733,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -1190,6 +1190,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1590,6 +1591,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2205,6 +2207,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2540,6 +2543,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2974,6 +2978,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3056,6 +3061,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4749,6 +4755,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5077,6 +5084,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5466,6 +5474,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5540,6 +5549,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6062,6 +6072,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6105,6 +6116,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6879,6 +6891,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7438,6 +7451,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7708,6 +7722,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2200,6 +2202,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2534,6 +2537,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2968,6 +2972,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3048,6 +3053,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_1";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4728,6 +4734,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5055,6 +5062,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5443,6 +5451,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5517,6 +5526,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6035,6 +6045,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6078,6 +6089,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6849,6 +6861,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7406,6 +7419,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7674,6 +7688,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2200,6 +2202,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2534,6 +2537,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2968,6 +2972,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3048,6 +3053,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4726,6 +4732,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5052,6 +5059,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5439,6 +5447,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5513,6 +5522,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6031,6 +6041,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6074,6 +6085,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6845,6 +6857,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7402,6 +7415,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7670,6 +7684,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2200,6 +2202,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2534,6 +2537,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2968,6 +2972,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3048,6 +3053,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4725,6 +4731,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5051,6 +5058,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5438,6 +5446,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5512,6 +5521,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6030,6 +6040,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6073,6 +6084,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6844,6 +6856,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7400,6 +7413,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7668,6 +7682,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2200,6 +2202,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2534,6 +2537,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2967,6 +2971,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3047,6 +3052,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4723,6 +4729,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5049,6 +5056,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5436,6 +5444,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5510,6 +5519,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6028,6 +6038,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6071,6 +6082,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6842,6 +6854,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7398,6 +7411,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7665,6 +7679,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -1188,6 +1188,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1587,6 +1588,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2198,6 +2200,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2531,6 +2534,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2964,6 +2968,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3044,6 +3049,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4719,6 +4725,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5044,6 +5051,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5431,6 +5439,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5504,6 +5513,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6021,6 +6031,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6064,6 +6075,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6834,6 +6846,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7390,6 +7403,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7657,6 +7671,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -1187,6 +1187,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1586,6 +1587,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2195,6 +2197,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2527,6 +2530,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2959,6 +2963,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3039,6 +3044,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4714,6 +4720,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5039,6 +5046,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5426,6 +5434,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5499,6 +5508,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6014,6 +6024,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6057,6 +6068,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6825,6 +6837,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7381,6 +7394,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7646,6 +7660,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -1190,6 +1190,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1590,6 +1591,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2204,6 +2206,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2538,6 +2541,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2972,6 +2976,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3054,6 +3059,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4746,6 +4752,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5074,6 +5081,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5463,6 +5471,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5537,6 +5546,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6058,6 +6068,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6101,6 +6112,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6874,6 +6886,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7432,6 +7445,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7702,6 +7716,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2203,6 +2205,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2537,6 +2540,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2971,6 +2975,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3053,6 +3058,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7_1";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4743,6 +4749,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5071,6 +5078,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13";
  "language-kort" = dontDistribute super."language-kort";
@ -5460,6 +5468,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5534,6 +5543,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6054,6 +6064,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6097,6 +6108,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6869,6 +6881,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7427,6 +7440,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7696,6 +7710,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2202,6 +2204,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2536,6 +2539,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2970,6 +2974,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3052,6 +3057,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_7_1";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4741,6 +4747,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5069,6 +5076,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5458,6 +5466,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5532,6 +5541,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6052,6 +6062,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6095,6 +6106,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6867,6 +6879,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7425,6 +7438,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7694,6 +7708,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2202,6 +2204,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2536,6 +2539,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2970,6 +2974,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3052,6 +3057,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8";
  "file-location" = doDistribute super."file-location_0_4_5_3";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4736,6 +4742,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5063,6 +5070,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5452,6 +5460,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5526,6 +5535,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6046,6 +6056,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6089,6 +6100,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6861,6 +6873,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7419,6 +7432,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7688,6 +7702,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2202,6 +2204,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2536,6 +2539,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2970,6 +2974,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3050,6 +3055,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4732,6 +4738,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5059,6 +5066,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5447,6 +5455,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5521,6 +5530,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6041,6 +6051,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6084,6 +6095,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6856,6 +6868,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7414,6 +7427,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7683,6 +7697,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -1189,6 +1189,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1589,6 +1590,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_0_1_0";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2202,6 +2204,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = dontDistribute super."consul-haskell";
@ -2536,6 +2539,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2970,6 +2974,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_0_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3050,6 +3055,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8";
  "file-location" = doDistribute super."file-location_0_4_6";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4730,6 +4736,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -5057,6 +5064,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5445,6 +5453,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5519,6 +5528,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -6038,6 +6048,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -6081,6 +6092,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec" = doDistribute super."parsec_3_1_8";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
@ -6853,6 +6865,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7411,6 +7424,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_3_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7680,6 +7694,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -1178,6 +1178,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1574,6 +1575,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_1_0_2";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2179,6 +2181,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2508,6 +2511,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2938,6 +2942,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3019,6 +3024,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4676,6 +4682,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4996,6 +5003,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5378,6 +5386,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5451,6 +5460,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5955,6 +5965,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5998,6 +6009,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6762,6 +6774,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7313,6 +7326,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_6_0_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7575,6 +7589,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -1178,6 +1178,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_5";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1574,6 +1575,7 @@ self: super: {
  "binary-list" = doDistribute super."binary-list_1_1_0_2";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2178,6 +2180,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2507,6 +2510,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2937,6 +2941,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3018,6 +3023,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4674,6 +4680,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4994,6 +5001,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5376,6 +5384,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5449,6 +5458,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5953,6 +5963,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5996,6 +6007,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6760,6 +6772,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7311,6 +7324,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_6_0_1";
  "stackage-build-plan" = dontDistribute super."stackage-build-plan";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
@ -7573,6 +7587,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -1173,6 +1173,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_6";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1565,6 +1566,7 @@ self: super: {
  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2165,6 +2167,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2492,6 +2495,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2920,6 +2924,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -3000,6 +3005,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4646,6 +4652,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4962,6 +4969,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5088,6 +5096,7 @@ self: super: {
  "libxslt" = dontDistribute super."libxslt";
  "life" = dontDistribute super."life";
  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_1";
  "lifted-threads" = dontDistribute super."lifted-threads";
  "lifter" = dontDistribute super."lifter";
  "ligature" = dontDistribute super."ligature";
@ -5336,6 +5345,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5409,6 +5419,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5912,6 +5923,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5953,6 +5965,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6647,6 +6660,7 @@ self: super: {
  "resource-simple" = dontDistribute super."resource-simple";
  "resourcet" = doDistribute super."resourcet_1_1_5";
  "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_3";
  "rest-core" = doDistribute super."rest-core_0_35_1";
  "rest-example" = dontDistribute super."rest-example";
  "rest-gen" = doDistribute super."rest-gen_0_17_0_4";
@ -6710,6 +6724,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7258,6 +7273,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_7_2_0";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
  "stackage-curator" = doDistribute super."stackage-curator_0_7_4";
@ -7512,6 +7528,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -1172,6 +1172,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_6";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1564,6 +1565,7 @@ self: super: {
  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2164,6 +2166,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2491,6 +2494,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2919,6 +2923,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -2999,6 +3004,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4642,6 +4648,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4957,6 +4964,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5083,6 +5091,7 @@ self: super: {
  "libxslt" = dontDistribute super."libxslt";
  "life" = dontDistribute super."life";
  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_1";
  "lifted-threads" = dontDistribute super."lifted-threads";
  "lifter" = dontDistribute super."lifter";
  "ligature" = dontDistribute super."ligature";
@ -5331,6 +5340,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5404,6 +5414,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5905,6 +5916,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5946,6 +5958,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6640,6 +6653,7 @@ self: super: {
  "resource-simple" = dontDistribute super."resource-simple";
  "resourcet" = doDistribute super."resourcet_1_1_5";
  "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_3";
  "rest-core" = doDistribute super."rest-core_0_35_1";
  "rest-example" = dontDistribute super."rest-example";
  "rest-gen" = doDistribute super."rest-gen_0_17_0_5";
@ -6702,6 +6716,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7250,6 +7265,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_7_2_0";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
  "stackage-curator" = doDistribute super."stackage-curator_0_7_4";
@ -7502,6 +7518,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -1172,6 +1172,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_6";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1564,6 +1565,7 @@ self: super: {
  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2164,6 +2166,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2491,6 +2494,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2919,6 +2923,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -2999,6 +3004,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4642,6 +4648,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4957,6 +4964,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5083,6 +5091,7 @@ self: super: {
  "libxslt" = dontDistribute super."libxslt";
  "life" = dontDistribute super."life";
  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_1";
  "lifted-threads" = dontDistribute super."lifted-threads";
  "lifter" = dontDistribute super."lifter";
  "ligature" = dontDistribute super."ligature";
@ -5331,6 +5340,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5404,6 +5414,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5905,6 +5916,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5946,6 +5958,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6640,6 +6653,7 @@ self: super: {
  "resource-simple" = dontDistribute super."resource-simple";
  "resourcet" = doDistribute super."resourcet_1_1_5";
  "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_3";
  "rest-core" = doDistribute super."rest-core_0_35_1";
  "rest-example" = dontDistribute super."rest-example";
  "rest-gen" = doDistribute super."rest-gen_0_17_0_5";
@ -6702,6 +6716,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7249,6 +7264,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_7_2_0";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
  "stackage-curator" = doDistribute super."stackage-curator_0_7_4";
@ -7501,6 +7517,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -1172,6 +1172,7 @@ self: super: {
  "al" = dontDistribute super."al";
  "alarmclock" = doDistribute super."alarmclock_0_2_0_6";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1564,6 +1565,7 @@ self: super: {
  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2164,6 +2166,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2491,6 +2494,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2919,6 +2923,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -2999,6 +3004,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4640,6 +4646,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4955,6 +4962,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5081,6 +5089,7 @@ self: super: {
  "libxslt" = dontDistribute super."libxslt";
  "life" = dontDistribute super."life";
  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_1";
  "lifted-threads" = dontDistribute super."lifted-threads";
  "lifter" = dontDistribute super."lifter";
  "ligature" = dontDistribute super."ligature";
@ -5329,6 +5338,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5402,6 +5412,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5902,6 +5913,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5943,6 +5955,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6637,6 +6650,7 @@ self: super: {
  "resource-simple" = dontDistribute super."resource-simple";
  "resourcet" = doDistribute super."resourcet_1_1_5";
  "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_3";
  "rest-core" = doDistribute super."rest-core_0_35_1";
  "rest-example" = dontDistribute super."rest-example";
  "rest-gen" = doDistribute super."rest-gen_0_17_0_5";
@ -6699,6 +6713,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7246,6 +7261,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_7_2_0";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
  "stackage-curator" = doDistribute super."stackage-curator_0_7_4";
@ -7498,6 +7514,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -1171,6 +1171,7 @@ self: super: {
  "ajhc" = dontDistribute super."ajhc";
  "al" = dontDistribute super."al";
  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
  "alex-meta" = dontDistribute super."alex-meta";
  "alfred" = dontDistribute super."alfred";
  "alga" = dontDistribute super."alga";
@ -1563,6 +1564,7 @@ self: super: {
  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
  "binary-orphans" = dontDistribute super."binary-orphans";
+  "binary-parser" = dontDistribute super."binary-parser";
  "binary-protocol" = dontDistribute super."binary-protocol";
  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
  "binary-search" = dontDistribute super."binary-search";
@ -2163,6 +2165,7 @@ self: super: {
  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
  "constrained-categories" = dontDistribute super."constrained-categories";
  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_4_1_3";
  "constructible" = dontDistribute super."constructible";
  "constructive-algebra" = dontDistribute super."constructive-algebra";
  "consul-haskell" = doDistribute super."consul-haskell_0_1";
@ -2490,6 +2493,7 @@ self: super: {
  "delaunay" = dontDistribute super."delaunay";
  "delicious" = dontDistribute super."delicious";
  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
  "delta" = dontDistribute super."delta";
  "delta-h" = dontDistribute super."delta-h";
  "demarcate" = dontDistribute super."demarcate";
@ -2918,6 +2922,7 @@ self: super: {
  "extensible-effects" = dontDistribute super."extensible-effects";
  "external-sort" = dontDistribute super."external-sort";
  "extra" = doDistribute super."extra_1_1";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
  "extractelf" = dontDistribute super."extractelf";
  "ez-couch" = dontDistribute super."ez-couch";
  "faceted" = dontDistribute super."faceted";
@ -2998,6 +3003,7 @@ self: super: {
  "file-command-qq" = dontDistribute super."file-command-qq";
  "file-embed" = doDistribute super."file-embed_0_0_8_2";
  "file-location" = doDistribute super."file-location_0_4_7_1";
+  "file-modules" = dontDistribute super."file-modules";
  "filecache" = dontDistribute super."filecache";
  "filediff" = dontDistribute super."filediff";
  "filelock" = dontDistribute super."filelock";
@ -4637,6 +4643,7 @@ self: super: {
  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
  "indices" = dontDistribute super."indices";
  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
  "infer-upstream" = dontDistribute super."infer-upstream";
  "infernu" = dontDistribute super."infernu";
  "infinite-search" = dontDistribute super."infinite-search";
@ -4952,6 +4959,7 @@ self: super: {
  "language-glsl" = doDistribute super."language-glsl_0_1_1";
  "language-go" = dontDistribute super."language-go";
  "language-guess" = dontDistribute super."language-guess";
+  "language-java" = doDistribute super."language-java_0_2_7";
  "language-java-classfile" = dontDistribute super."language-java-classfile";
  "language-javascript" = doDistribute super."language-javascript_0_5_13_3";
  "language-kort" = dontDistribute super."language-kort";
@ -5078,6 +5086,7 @@ self: super: {
  "libxslt" = dontDistribute super."libxslt";
  "life" = dontDistribute super."life";
  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_1";
  "lifted-threads" = dontDistribute super."lifted-threads";
  "lifter" = dontDistribute super."lifter";
  "ligature" = dontDistribute super."ligature";
@ -5326,6 +5335,7 @@ self: super: {
  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
  "mcmc-types" = dontDistribute super."mcmc-types";
  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
  "mdcat" = dontDistribute super."mdcat";
  "mdo" = dontDistribute super."mdo";
  "mecab" = dontDistribute super."mecab";
@ -5399,6 +5409,7 @@ self: super: {
  "minesweeper" = dontDistribute super."minesweeper";
  "miniball" = dontDistribute super."miniball";
  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
  "minimal-configuration" = dontDistribute super."minimal-configuration";
  "minimorph" = dontDistribute super."minimorph";
  "minimung" = dontDistribute super."minimung";
@ -5899,6 +5910,7 @@ self: super: {
  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
  "overture" = dontDistribute super."overture";
  "pack" = dontDistribute super."pack";
+  "package-description-remote" = dontDistribute super."package-description-remote";
  "package-o-tron" = dontDistribute super."package-o-tron";
  "package-vt" = dontDistribute super."package-vt";
  "packdeps" = dontDistribute super."packdeps";
@ -5940,6 +5952,7 @@ self: super: {
  "parport" = dontDistribute super."parport";
  "parse-dimacs" = dontDistribute super."parse-dimacs";
  "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_1_5_2";
  "parsec-extra" = dontDistribute super."parsec-extra";
  "parsec-numbers" = dontDistribute super."parsec-numbers";
  "parsec-parsers" = dontDistribute super."parsec-parsers";
@ -6633,6 +6646,7 @@ self: super: {
  "resource-simple" = dontDistribute super."resource-simple";
  "resourcet" = doDistribute super."resourcet_1_1_5";
  "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_3";
  "rest-core" = doDistribute super."rest-core_0_35_1";
  "rest-example" = dontDistribute super."rest-example";
  "rest-gen" = doDistribute super."rest-gen_0_17_0_5";
@ -6695,6 +6709,7 @@ self: super: {
  "rope" = dontDistribute super."rope";
  "rosa" = dontDistribute super."rosa";
  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
  "rosezipper" = dontDistribute super."rosezipper";
  "roshask" = dontDistribute super."roshask";
  "rosso" = dontDistribute super."rosso";
@ -7241,6 +7256,7 @@ self: super: {
  "stack" = dontDistribute super."stack";
  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
  "stackage" = doDistribute super."stackage_0_7_2_0";
  "stackage-cabal" = dontDistribute super."stackage-cabal";
  "stackage-curator" = doDistribute super."stackage-curator_0_7_4";
@ -7493,6 +7509,7 @@ self: super: {
  "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
  "tasty-rerun" = dontDistribute super."tasty-rerun";
  "tasty-silver" = dontDistribute super."tasty-silver";
+  "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
  "tasty-tap" = dontDistribute super."tasty-tap";
  "tateti-tateti" = dontDistribute super."tateti-tateti";
  "tau" = dontDistribute super."tau";
--- a/Show more
+++ b/Show more